b9ea4a6ba4
This reverts commit a006cf681b.
It was squash-merged by accident; let's redo that without squashing.
39 lines
1.8 KiB
Diff
39 lines
1.8 KiB
Diff
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 4bdcc50a40e498f83eef230780d538c77e038c80..5b6f371b80675a8681accf28eeeb1ce5fc981d36 100644
|
|
--- a/content/browser/web_contents/web_contents_view_aura.cc
|
|
+++ b/content/browser/web_contents/web_contents_view_aura.cc
|
|
@@ -794,9 +794,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const {
|
|
|
|
bool WebContentsViewAura::IsValidDragTarget(
|
|
RenderWidgetHostImpl* target_rwh) const {
|
|
- return target_rwh->GetProcess()->GetID() == drag_start_process_id_ ||
|
|
- GetRenderViewHostID(web_contents_->GetRenderViewHost()) !=
|
|
- drag_start_view_id_;
|
|
+ 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 623179b59639da685c8d43a0a7fe10045ede5ebd..20a17f90d9da070438471726e048ba3cf49d8fdf 100644
|
|
--- a/content/browser/web_contents/web_drag_dest_mac.mm
|
|
+++ b/content/browser/web_contents/web_drag_dest_mac.mm
|
|
@@ -382,9 +382,7 @@ - (void)setDragStartTrackersForProcess:(int)processID {
|
|
}
|
|
|
|
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
|
|
- return targetRWH->GetProcess()->GetID() == _dragStartProcessID ||
|
|
- GetRenderViewHostID(_webContents->GetRenderViewHost()) !=
|
|
- _dragStartViewID;
|
|
+ return YES;
|
|
}
|
|
|
|
@end
|