061e2e5e73
* chore: bump chromium in DEPS to 113.0.5645.0 * chore: update patches/chromium/mas_avoid_usage_of_private_macos_apis.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4300129 Fix simple code shear * chore: update patches/chromium/build_only_use_the_mas_build_config_in_the_required_components.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4297496 Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4327491 patch-fuzz update; no manual changes * chore: remove patches/chromium/fix_x11_window_restore_minimized_maximized_window.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4252946 Upstreamed by zcbenz, so local patch is no longer needed * chore: update chromium/printing.patch Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4313019 Remove cookie parameter from PrintViewManagerBase::UpdatePrintSettings() * chore: remove NOTIMPLEMENTED BrowserProcessImpl::GetBreadcrumbPersistentStorageManager() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4247145 method removed upstream, so we do not need to add a stub for it in the subclass * chore: remove PrintViewManagerElectron::UpdatePrintSettings() Xref: https://chromium-review.googlesource.com/c/chromium/src/+/4313019 Previously, our implementation checked to see if we recognized the cookie param that was passed in. If so, we reported a bad message. Otherwise, we passed it up to the base class' UpdatePrintSettings(). CL4313019 removed the cookie param, so checking for a bad cookie param is no longer necessary / no longer possible. Since the only remaining task was to pass the work up to the base class, this commit removes the subclass implmentation entirely. * chore: update patches * chore: bump chromium in DEPS to 113.0.5647.0 * chore: bump chromium in DEPS to 113.0.5649.2 * chore: bump chromium in DEPS to 113.0.5651.0 * chore: update patches --------- 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: 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 37b75adc1ef25d1688ea63da083c8dd764e953c8..63175581edc351e3dc13caa97ab0b86d1a7791c8 100644
|
|
--- a/content/browser/web_contents/web_contents_view_aura.cc
|
|
+++ b/content/browser/web_contents/web_contents_view_aura.cc
|
|
@@ -919,10 +919,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 d19a52391c0a38b498931638009e792bb73316f7..eb86bd94062bd0175c0e5529e463694092e738cf 100644
|
|
--- a/content/browser/web_contents/web_drag_dest_mac.mm
|
|
+++ b/content/browser/web_contents/web_drag_dest_mac.mm
|
|
@@ -389,9 +389,7 @@ - (void)resetDragStartTrackers {
|
|
}
|
|
|
|
- (bool)isValidDragTarget:(content::RenderWidgetHostImpl*)targetRWH {
|
|
- return targetRWH->GetProcess()->GetID() == _dragStartProcessID ||
|
|
- GetRenderViewHostID(_webContents->GetRenderViewHost()) !=
|
|
- _dragStartViewID;
|
|
+ return YES;
|
|
}
|
|
|
|
@end
|