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 8a6fd2e52b81f1f541d88c795fbc2697a58f0ea9..9d3efca9c19c9c97c636258017cc16c8bf94b5b1 100644
- --- a/content/browser/web_contents/web_contents_view_aura.cc
- +++ b/content/browser/web_contents/web_contents_view_aura.cc
- @@ -884,10 +884,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 808e3103cd12d32b54dc80dc122746923db83138..298ad238a2d26603b2af8f9143fa5881ba09184a 100644
- --- a/content/browser/web_contents/web_drag_dest_mac.mm
- +++ b/content/browser/web_contents/web_drag_dest_mac.mm
- @@ -422,9 +422,7 @@ - (void)resetDragStartTrackers {
- }
-
- - (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
- - return targetRWH->GetProcess()->GetID() == _dragStartProcessID ||
- - GetRenderViewHostID(_webContents->GetRenderViewHost()) !=
- - _dragStartViewID;
- + return YES;
- }
-
- @end
|