12345678910111213141516171819202122232425262728293031323334353637383940 |
- From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
- From: Anonymous <[email protected]>
- Date: Thu, 20 Sep 2018 17:47:04 -0700
- Subject: webview_cross_drag.patch
- This allows dragging and dropping between <webview>s.
- Originally landed in https://github.com/electron/libchromiumcontent/pull/267
- diff --git a/content/browser/web_contents/web_contents_view_aura.cc b/content/browser/web_contents/web_contents_view_aura.cc
- index 4095ee0ef25226180acb35d320630f971305528e..a0aff5ad93e7644211a2c15553b3d0988f380b7b 100644
- --- a/content/browser/web_contents/web_contents_view_aura.cc
- +++ b/content/browser/web_contents/web_contents_view_aura.cc
- @@ -899,10 +899,7 @@ bool WebContentsViewAura::IsValidDragTarget(
- // for the outermost view. Inner `WebContents` will have a
- // `WebContentsViewChildFrame` so when dragging between an inner
- // `WebContents` and its embedder the view IDs will be the same.
- - bool cross_tab_drag =
- - GetRenderViewHostID(web_contents_->GetRenderViewHost()) !=
- - drag_start_->view_id;
- - return cross_tab_drag;
- + return true;
- }
-
- ////////////////////////////////////////////////////////////////////////////////
- diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
- index 6455404fdccab1fffceef4b8d291c137d3a448c4..483b0b5b689da03f0d7e43576fa73275197f5a95 100644
- --- a/content/browser/web_contents/web_drag_dest_mac.mm
- +++ b/content/browser/web_contents/web_drag_dest_mac.mm
- @@ -385,9 +385,7 @@ - (void)setDragStartTrackersForProcess:(int)processID {
- }
-
- - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
- - return targetRWH->GetProcess()->GetID() == _dragStartProcessID ||
- - GetRenderViewHostID(_webContents->GetRenderViewHost()) !=
- - _dragStartViewID;
- + return YES;
- }
-
- @end
|