28eda03aba
* chore: bump chromium in DEPS to 119.0.6018.4 * chore: update patches * chore: bump chromium in DEPS to 119.0.6019.2 * chore: update patches * 4876292: Roll libc++ from 7cee6b00d34a to 3e8a3b3c5d49 (6 revisions) https://chromium-review.googlesource.com/c/chromium/src/+/4876292 * 4851616: [Extensions] Enable matchOriginAsFallback for dynamic content scripts https://chromium-review.googlesource.com/c/chromium/src/+/4851616 * 4869393: [Extensions UserScripts] Add error messages for script matching errors https://chromium-review.googlesource.com/c/chromium/src/+/4869393 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
40 lines
1.8 KiB
Diff
40 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 4dea8da5af79d8fd50cc9a48fb08381b8501666a..8508a57b96dbad925a32d36a6b665fd8f763d3c5 100644
|
|
--- a/content/browser/web_contents/web_contents_view_aura.cc
|
|
+++ b/content/browser/web_contents/web_contents_view_aura.cc
|
|
@@ -884,10 +884,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 808e3103cd12d32b54dc80dc122746923db83138..298ad238a2d26603b2af8f9143fa5881ba09184a 100644
|
|
--- a/content/browser/web_contents/web_drag_dest_mac.mm
|
|
+++ b/content/browser/web_contents/web_drag_dest_mac.mm
|
|
@@ -422,9 +422,7 @@ - (void)resetDragStartTrackers {
|
|
}
|
|
|
|
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
|
|
- return targetRWH->GetProcess()->GetID() == _dragStartProcessID ||
|
|
- GetRenderViewHostID(_webContents->GetRenderViewHost()) !=
|
|
- _dragStartViewID;
|
|
+ return YES;
|
|
}
|
|
|
|
@end
|