b711860d21
* chore: bump chromium in DEPS to 102.0.4965.0 * chore: 3-way merge of chromium/printing.patch * chore: update patch shear in chromium/picture-in-picture.patch * chore: update patches * 3101519: Window Placement: Prototype fullscreen companion window support Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3101519 build: add popup_preventer.cc, .h to our library. It's needed because FullscreenController, we were already using, started aggregating a PopupPreventer in 3101519. * chore: bump chromium in DEPS to 102.0.4967.0 * Revert "3101519: Window Placement: Prototype fullscreen companion window support" This reverts commit fc215cb99c464e939882ed3f5cf8e9874a8e3311. Adding popup_preventer might not be the right solution; there are cascading dependencies. * 3551449: Add service-based usage for system print settings Xref: https://chromium-review.googlesource.com/c/chromium/src/+/3551449 chore: fix code shear in patches/chromium/printing.patch * chore: update patches * chore: bump chromium in DEPS to 102.0.4969.0 * chore: update patches * chore: bump chromium in DEPS to 102.0.4971.0 * chore: update fix_patch_out_permissions_checks_in_exclusive_access.patch Refs https://chromium-review.googlesource.com/c/chromium/src/+/3101519 PopupunderPreventer is not useful in //electron since the window attributes are controlled by the user via setWindowOpenHandler. * chore: update patches * Add FirstPartySetsHandler as a interface class in content API. https://chromium-review.googlesource.com/c/chromium/src/+/3503410 * Create a new MediaStreamRequestType for GetOpenDevice https://chromium-review.googlesource.com/c/chromium/src/+/3541939 * Support site isolation for <webview> tags in WebViewRendererState. https://chromium-review.googlesource.com/c/chromium/src/+/3537735 * ci: update xcode version Refs https://chromium-review.googlesource.com/c/chromium/src/+/3544199 https://developer.apple.com/documentation/screencapturekit/capturing_screen_content_in_macos Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@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 4095ee0ef25226180acb35d320630f971305528e..a0aff5ad93e7644211a2c15553b3d0988f380b7b 100644
|
|
--- a/content/browser/web_contents/web_contents_view_aura.cc
|
|
+++ b/content/browser/web_contents/web_contents_view_aura.cc
|
|
@@ -899,10 +899,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 dab3703cc4469802bae9e4d45c3e7d0f0857f577..ecd8af37c681ae5c97060af00bbeb8ebddb72b26 100644
|
|
--- a/content/browser/web_contents/web_drag_dest_mac.mm
|
|
+++ b/content/browser/web_contents/web_drag_dest_mac.mm
|
|
@@ -388,9 +388,7 @@ - (void)setDragStartTrackersForProcess:(int)processID {
|
|
}
|
|
|
|
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
|
|
- return targetRWH->GetProcess()->GetID() == _dragStartProcessID ||
|
|
- GetRenderViewHostID(_webContents->GetRenderViewHost()) !=
|
|
- _dragStartViewID;
|
|
+ return YES;
|
|
}
|
|
|
|
@end
|