mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
04f2b2e2e3
* chore: bump chromium in DEPS to 102.0.5005.12 * chore: bump chromium in DEPS to 102.0.5005.22 * 3587410: [Printing] Remove JobEventDetails Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3587410 (cherry picked from commit 75d75bc087a29640cc58ecb7122dbc8ea10ce785) * chore: update patches * 3579297: Convert UpdatePrintSettings() to use non-deprecated base::Value APIs. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3579297 * 3577218: WebUI: Delete webui_resources.grd and related GN targets. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3577218 (cherry picked from commit b12e658fee8f8d8832145f0ab141549c3466f567) * chore: bump chromium in DEPS to 102.0.5005.27 * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 (cherry picked from commit9ccc4d6249) * 3584006: Remove IsRenderViewLive from content public Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3584006 (cherry picked from commit5c5bc4ca6d) * 3368244: Hook SnapshotForContentAnalysis renderer API to scan system prints Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3368244 (cherry picked from commitdbdff6fe7e) * 3581708: Restore original display when moving from tab-fullscreen to browser-fullscreen. Ref: https://chromium-review.googlesource.com/c/chromium/src/+/3581708 (cherry picked from commitc02749954c) * 64908: Stop building legacy SwiftShader GL in Chromium https://swiftshader-review.googlesource.com/c/SwiftShader/+/64908 * 3573245: Added Themed versions of RoundedRectBackground and RoundedRectBorder. https://chromium-review.googlesource.com/c/chromium/src/+/3573245 * fixup for lint Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Keeley Hammond <khammond@slack-corp.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: VerteDinde <vertedinde@electronjs.org>
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 f76a0ee0778d7b4e4df69a4c43b4a6bfdc89294d..45baa4d62cb4e5aebedebba993ddbc9f06711d35 100644
|
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
|
@@ -159,6 +159,7 @@
|
|
#include "third_party/blink/renderer/core/timing/window_performance.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"
|
|
@@ -1776,6 +1777,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)
|