2018-10-24 18:24:11 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-09-21 00:30:26 +00:00
|
|
|
From: Anonymous <anonymous@electronjs.org>
|
|
|
|
|
Date: Thu, 20 Sep 2018 17:47:04 -0700
|
|
|
|
|
Subject: webview_cross_drag.patch
|
|
|
|
|
|
2019-12-13 17:18:45 +00:00
|
|
|
This allows dragging and dropping between <webview>s.
|
|
|
|
|
|
|
|
|
|
Originally landed in https://github.com/electron/libchromiumcontent/pull/267
|
2018-09-21 00:30:26 +00:00
|
|
|
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
|
2020-01-17 18:41:52 +00:00
|
|
|
index c87d192133c39b29259bc50d3c30d88bc28d2978..354cc294165c5fe248388fb5522efb42da91e4ca 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/browser/web_contents/web_contents_view_aura.cc
|
|
|
|
|
+++ b/content/browser/web_contents/web_contents_view_aura.cc
|
2020-01-17 18:41:52 +00:00
|
|
|
@@ -795,6 +795,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const {
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
|
bool WebContentsViewAura::IsValidDragTarget(
|
|
|
|
|
RenderWidgetHostImpl* target_rwh) const {
|
|
|
|
|
+ return true;
|
|
|
|
|
return target_rwh->GetProcess()->GetID() == drag_start_process_id_ ||
|
|
|
|
|
GetRenderViewHostID(web_contents_->GetRenderViewHost()) !=
|
|
|
|
|
drag_start_view_id_;
|
|
|
|
|
diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
|
2020-01-17 18:41:52 +00:00
|
|
|
index 59456ed3693426952e8c574d4982a00e6f01e9b3..196fb4a6ee9d178e0e6657bc013d4393ca8a9427 100644
|
2018-09-14 05:02:16 +00:00
|
|
|
--- a/content/browser/web_contents/web_drag_dest_mac.mm
|
|
|
|
|
+++ b/content/browser/web_contents/web_drag_dest_mac.mm
|
2019-03-29 00:05:53 +00:00
|
|
|
@@ -336,6 +336,7 @@ - (void)setDragStartTrackersForProcess:(int)processID {
|
2018-09-14 05:02:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
|
|
|
|
|
+ return YES;
|
2019-12-13 20:13:12 +00:00
|
|
|
return targetRWH->GetProcess()->GetID() == _dragStartProcessID ||
|
|
|
|
|
GetRenderViewHostID(_webContents->GetRenderViewHost()) !=
|
|
|
|
|
_dragStartViewID;
|
