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-06-22 17:35:10 +00:00
|
|
|
index 3e382a6aaa621f91abd9553b3ba9f77a38dad3bd..6b0706c20367b26258df8990ec393e06ffa12f95 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-06-22 17:35:10 +00:00
|
|
|
@@ -784,9 +784,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const {
|
2018-09-14 05:02:16 +00:00
|
|
|
|
|
|
|
bool WebContentsViewAura::IsValidDragTarget(
|
|
|
|
RenderWidgetHostImpl* target_rwh) const {
|
2020-04-06 20:09:52 +00:00
|
|
|
- return target_rwh->GetProcess()->GetID() == drag_start_process_id_ ||
|
|
|
|
- GetRenderViewHostID(web_contents_->GetRenderViewHost()) !=
|
|
|
|
- drag_start_view_id_;
|
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
|
2020-06-22 17:35:10 +00:00
|
|
|
index a964f38b830f62bf694646033e1c24e0cf4557c5..61e69fdebaca038d09b5ebab71fd20e2e13188f0 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
|
2020-06-22 17:35:10 +00:00
|
|
|
@@ -384,9 +384,7 @@ void DropCompletionCallback(
|
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
|