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
|
2022-06-27 20:50:08 +00:00
|
|
|
index 6f963b0a1fcb00a16bcf423a494aad29b4c86b52..004fbb98b212372f7af73b9334ff44fb7a2a5eba 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
|
2022-06-27 20:50:08 +00:00
|
|
|
@@ -901,10 +901,7 @@ bool WebContentsViewAura::IsValidDragTarget(
|
2022-03-25 01:39:03 +00:00
|
|
|
// 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;
|
2018-09-14 05:02:16 +00:00
|
|
|
+ return true;
|
2020-04-06 20:09:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
2018-09-14 05:02:16 +00:00
|
|
|
diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
|
2022-03-30 18:08:58 +00:00
|
|
|
index dab3703cc4469802bae9e4d45c3e7d0f0857f577..ecd8af37c681ae5c97060af00bbeb8ebddb72b26 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
|
2022-03-30 18:08:58 +00:00
|
|
|
@@ -388,9 +388,7 @@ - (void)setDragStartTrackersForProcess:(int)processID {
|
2018-09-14 05:02:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
|
2020-04-06 20:09:52 +00:00
|
|
|
- return targetRWH->GetProcess()->GetID() == _dragStartProcessID ||
|
|
|
|
|
- GetRenderViewHostID(_webContents->GetRenderViewHost()) !=
|
|
|
|
|
- _dragStartViewID;
|
2018-09-14 05:02:16 +00:00
|
|
|
+ return YES;
|
2020-04-06 20:09:52 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@end
|
