095ae30f6dchore: bump chromium to 140.0.7339.2 (main) (#47929) * chore: bump chromium in DEPS to 140.0.7330.0 * chore: bump chromium in DEPS to 140.0.7331.0 * chore: update patches * fix: gn check failing on crashpad.h Not yet sure what caused this * fix: predictors::PreconnectManager -> content::PreconnectManager CL: https://chromium-review.googlesource.com/c/chromium/src/+/6788473 * chore: bump chromium in DEPS to 140.0.7333.0 * chore: bump chromium in DEPS to 140.0.7335.0 * chore: bump chromium in DEPS to 140.0.7337.0 * chore: update patches * chore: restore some gin utility * 6804057: [Extensions] Validate nodoc is specified as a boolean in schemas https://chromium-review.googlesource.com/c/chromium/src/+/6804057 * fixup! chore: restore some gin utility * fixup! fix: predictors::PreconnectManager -> content::PreconnectManager CL: https://chromium-review.googlesource.com/c/chromium/src/+/6788473 * 6772346: Reset MouseWheelPhaseHandler state when trackpoint scroll is detected https://chromium-review.googlesource.com/c/chromium/src/+/6772346 Not certain about what the "correct" argument to pass here is. A quick dive into the CL suggests that passing `false` is safe to keep things working. The blast radius if this assumption is wrong is that "fling" scroll gestures may not work as expected with the OSR. * 6789383: Uninstall SODA language pack after 30 days of inactivity https://chromium-review.googlesource.com/c/chromium/src/+/6789383 * chore: update libcxx filenames * chore: bump chromium in DEPS to 140.0.7339.0 * chore: update patches * fixup! 6772346: Reset MouseWheelPhaseHandler state when trackpoint scroll is detected https://chromium-review.googlesource.com/c/chromium/src/+/6772346 * chore: bump chromium in DEPS to 140.0.7339.2 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Samuel Maddock <smaddock@slack-corp.com> Co-authored-by: deepak1556 <hop2deep@gmail.com>
29 lines
1.4 KiB
Diff
29 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Attard <sattard@slack-corp.com>
|
|
Date: Mon, 8 Mar 2021 16:27:39 -0800
|
|
Subject: extend ApplyWebPreferences with Electron-specific logic
|
|
|
|
On macOS, popup menus are rendered by the main process by default.
|
|
This causes problems in OSR, since when the popup is rendered separately,
|
|
it won't be captured in the rendered image.
|
|
Offscreen can be updated at runtime, as such we need to apply the
|
|
turn on/off ExternalPopupMenu in the ApplyPreferences method.
|
|
There is no current way to attach an observer to these prefs so patching
|
|
is our only option.
|
|
|
|
Ideally we could add an embedder observer pattern here but that can be
|
|
done in future work.
|
|
|
|
diff --git a/third_party/blink/renderer/core/exported/web_view_impl.cc b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
|
index 6ba55d345d4b18c9c76e26a8a1eb3835dd692581..a2eea9184ebab62c057c0c6e370f03f3b0460859 100644
|
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
|
@@ -1886,6 +1886,8 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
|
|
#if BUILDFLAG(IS_MAC)
|
|
web_view_impl->SetMaximumLegibleScale(
|
|
prefs.default_maximum_page_scale_factor);
|
|
+ web_view_impl->GetChromeClient().SetUseExternalPopupMenusForTesting(
|
|
+ !prefs.offscreen);
|
|
#endif
|
|
|
|
#if BUILDFLAG(IS_WIN)
|