mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
cddfdf3ba2
* chore: bump chromium in DEPS to 116.0.5805.2 * chore: bump chromium in DEPS to 116.0.5807.0 * chore: update patches * chore: bump chromium in DEPS to 116.0.5809.2 * chore: bump chromium in DEPS to 116.0.5811.0 * chore: bump chromium in DEPS to 116.0.5813.0 * chore: bump chromium in DEPS to 116.0.5815.0 * chore: bump chromium in DEPS to 116.0.5817.0 * chore: bump chromium in DEPS to 116.0.5819.0 * chore: bump chromium in DEPS to 116.0.5821.0 * chore: bump chromium in DEPS to 116.0.5823.0 * chore: bump chromium in DEPS to 116.0.5825.0 * chore: bump chromium in DEPS to 116.0.5827.0 * chore: bump chromium to 116.0.5817.0 cherry picked fromfd5e6fbc14* refactor: add ARC scaffolding for macOS (#38621) (cherry picked from commit9a9d8ae5ea) --------- 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: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
34 lines
1.7 KiB
Diff
34 lines
1.7 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
|
|
|
|
background_color can be updated at runtime, as such we need to apply the
|
|
new background color to the WebView 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 0576934b9f747ab731ab1fe52c7d02882949e227..dec1e6be2a678ce407deec8dd30957e26e6d2ab1 100644
|
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
|
@@ -165,6 +165,7 @@
|
|
#include "third_party/blink/renderer/core/view_transition/view_transition_supplement.h"
|
|
#include "third_party/blink/renderer/platform/fonts/font_cache.h"
|
|
#include "third_party/blink/renderer/platform/fonts/generic_font_family_settings.h"
|
|
+#include "third_party/blink/renderer/platform/graphics/color.h"
|
|
#include "third_party/blink/renderer/platform/graphics/image.h"
|
|
#include "third_party/blink/renderer/platform/graphics/paint/cull_rect.h"
|
|
#include "third_party/blink/renderer/platform/graphics/paint/paint_record_builder.h"
|
|
@@ -1764,6 +1765,7 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
|
|
#if BUILDFLAG(IS_MAC)
|
|
web_view_impl->SetMaximumLegibleScale(
|
|
prefs.default_maximum_page_scale_factor);
|
|
+ SetUseExternalPopupMenus(!prefs.offscreen);
|
|
#endif
|
|
|
|
#if BUILDFLAG(IS_WIN)
|