Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Anonymous <anonymous@electronjs.org>
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 37b75adc1ef25d1688ea63da083c8dd764e953c8..63175581edc351e3dc13caa97ab0b86d1a7791c8 100644
--- a/content/browser/web_contents/web_contents_view_aura.cc
+++ b/content/browser/web_contents/web_contents_view_aura.cc
@@ -919,10 +919,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 6abd9ae6eafe6c5adfaa6a871ffad8e5e7cf44e2..87a97bd14d6ac028eb020197cfe40f41fa9d61a8 100644
--- a/content/browser/web_contents/web_drag_dest_mac.mm
+++ b/content/browser/web_contents/web_drag_dest_mac.mm
@@ -389,9 +389,7 @@ - (void)resetDragStartTrackers {
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
- return targetRWH->GetProcess()->GetID() == _dragStartProcessID ||
- GetRenderViewHostID(_webContents->GetRenderViewHost()) !=
- _dragStartViewID;
+ return YES;
@end