2b53788c35
* chore: bump chromium in DEPS to a1ea0d7aedd6b5fe58fbabfa3b05aa8ee41304ff * update patches * update extensions code * Remove WebPoint https://chromium-review.googlesource.com/c/chromium/src/+/2007474 * fix build * chore: bump chromium in DEPS to 9351e26c2a3714f8bbb10789c71bb51b0b494c75 * update patches * Remove error description from the DidFailLoadWithError message https://chromium-review.googlesource.com/c/chromium/src/+/2011280 * Make SimpleNetworkHintsHandlerImpl use the right NetworkIsolationKey https://chromium-review.googlesource.com/c/chromium/src/+/1994430 * Rename libgtkui to gtk https://chromium-review.googlesource.com/c/chromium/src/+/2011683 * [metrics] Remove histogram Startup.WarmStartTimeFromRemoteProcessStart*. https://chromium-review.googlesource.com/c/chromium/src/+/2003211 * fix requestSingleInstanceLock test * chore: bump chromium in DEPS to a813567a4f17ea08292c2b26fa10d0ffd47010d9 * chore: bump chromium in DEPS to f0aca2de536ceecd6eb66e928051d11e6d11991f * chore: bump chromium in DEPS to 865556af6d0c9d990f5b1816cb792f7c3859667b * chore: bump chromium in DEPS to 98538fdd28c4b6692e4cc2839729bb7ac009586a * update patches * fix broken tests * Update node tests for v8 changes * Update node patches for test failures * Update for number of tests Co-authored-by: Jeremy Apthorp <nornagon@nornagon.net> Co-authored-by: John Kleinschmidt <jkleinsc@github.com>
33 lines
1.7 KiB
Diff
33 lines
1.7 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 44bc4902a374821eecebf72bfcb150b7d86db621..c570fadb559230e17440c64b9042fbd9e73a910c 100644
|
|
--- a/content/browser/web_contents/web_contents_view_aura.cc
|
|
+++ b/content/browser/web_contents/web_contents_view_aura.cc
|
|
@@ -792,6 +792,7 @@ gfx::NativeView WebContentsViewAura::GetRenderWidgetHostViewParent() const {
|
|
|
|
bool WebContentsViewAura::IsValidDragTarget(
|
|
RenderWidgetHostImpl* target_rwh) const {
|
|
+ return true;
|
|
return target_rwh->GetProcess()->GetID() == drag_start_process_id_ ||
|
|
GetRenderViewHostID(web_contents_->GetRenderViewHost()) !=
|
|
drag_start_view_id_;
|
|
diff --git a/content/browser/web_contents/web_drag_dest_mac.mm b/content/browser/web_contents/web_drag_dest_mac.mm
|
|
index b35ff2edf854aa759a91fa708ed560d2f269e078..4ca6119b2105f27cabcb664d9ba7631973b49966 100644
|
|
--- a/content/browser/web_contents/web_drag_dest_mac.mm
|
|
+++ b/content/browser/web_contents/web_drag_dest_mac.mm
|
|
@@ -337,6 +337,7 @@ - (void)setDragStartTrackersForProcess:(int)processID {
|
|
}
|
|
|
|
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
|
|
+ return YES;
|
|
return targetRWH->GetProcess()->GetID() == _dragStartProcessID ||
|
|
GetRenderViewHostID(_webContents->GetRenderViewHost()) !=
|
|
_dragStartViewID;
|