8532e1239e
* chore: bump chromium in DEPS to 92.0.4512.6 * 2887336: [CaptureHandle][#2] Propagate CaptureHandleConfig in browser process2887336* refactor: base::Optional -> absl::optional * chore: fixup patch indices * chore: bump chromium in DEPS to 92.0.4514.0 * 2899417: Make build work when enable_pdf is set to false.2899417* 2904731: use BrowserContext instead of Profile in PreconnectManager2904731* 2295749: fix: check IsSecureEventInputEnabled in constructor before setting SetPasswordInputEnabled to true2295749* 2893803: Add a GetWebView to RenderFrame.2893803* 2892345: Implement WebContents::ForEachRenderFrameHost2892345* chore: fixup patch indices * 2892048: Real instance methods for BrowserContext: remaining 5 methods.2892048* 2902821: [mojo] Don't require full header includes for referenced interfaces2902821* 2496500: Remove last deprecated extension Event ctor.2496500* chore: fixup malformed pepper support patch * chore: bump chromium in DEPS to 92.0.4515.0 * 2908461: Add CreateEmptyPrintPagesParamsPtr() inside print_view_manager_base.cc.2908461* 2880838: viz: add optional HDRMetadata to TransferableResource2880838* chore: fixup patch indices * chore: bump chromium in DEPS to 92.0.4515.5 * chore: update patches * chore: bump chromium in DEPS to 92.0.4515.7 * chore: bump chromium in DEPS to 92.0.4515.9 * chore: bump chromium in DEPS to 93.0.4522.0 * chore: bump chromium in DEPS to 93.0.4523.0 * chore: bump chromium in DEPS to 93.0.4524.0 * chore: update patches * chore: enable_pak_file_integrity_checks was reverted * chore: update patches * refactor: base/optional was replaced with absl::optional Refs:2910202* refactor: replace all usages of base::nullopt with absl::nullopt Refs:2910202* chore: add missing base::Contains include Refs:2910202* refactor: replace all usages of base::make_optional with absl::make_optional Refs:2910202* refactor: replace WorldScriptContext() with GetScriptContextFromWorldId Refs:2893213* chore: clean up left over opening namespace Refs:95bfe6d08f* chore: add missing base::Contains include Refs:2910202* refactor: replace GetCurrentDisplayIterator with the hard checker GetCurrentDisplay This code looks suspicious but if the iterator was invalid before it will also be invalid now. Refs:2893191* refactor: headers are now passed directly in extensions client Refs:2918906* refactor: base::DictionaryValue::empty() has been removed Refs:2912424* chore: add missing includes for network URLLoaderFactory Refs: unknown, probably a side effect of header changes * refactor: make convenience wrapper around AppendArg There is no converter FromV8 for base::StringPiece (apparently its not possible). So we now take in an std::string and use the construct for StringPiece to do implicit conversion. Refs:2905544* chore: add patch * chore: bump chromium in DEPS to 93.0.4525.0 * chore: update patches * refactor: CanResize has been de-virtualized Refs:2485774* chore: update resource integrity patch * chore: add character encoding idl patch * chore: bump chromium in DEPS to 93.0.4526.0 * chore: update patches * chore: bump chromium in DEPS to 93.0.4527.0 * chore: bump chromium in DEPS to 93.0.4528.0 * chore: update patches * chore: update idl encoding patch * chore: bump chromium in DEPS to 93.0.4529.0 * chore: update patches * chore: bump chromium in DEPS to 93.0.4530.0 * chore: update patches * fix: only SetCanResize after the widget has been initialized * chore: add patch for vr on windows gn gen * spec: fix focus related tests on linux due to delay in focus swap * chore: remove new usages of base::Optional from main Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <sattard@slack-corp.com> Co-authored-by: Samuel Attard <samuel.r.attard@gmail.com>
42 lines
2 KiB
Diff
42 lines
2 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 ac730780c3f643b7131b742bd8fb6fd34aae0d9b..4db50c1dc41b4b0bec636f885a1fad6a11c0b5b7 100644
|
|
--- a/third_party/blink/renderer/core/exported/web_view_impl.cc
|
|
+++ b/third_party/blink/renderer/core/exported/web_view_impl.cc
|
|
@@ -155,6 +155,7 @@
|
|
#include "third_party/blink/renderer/core/timing/dom_window_performance.h"
|
|
#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/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"
|
|
@@ -1788,6 +1789,16 @@ void WebView::ApplyWebPreferences(const web_pref::WebPreferences& prefs,
|
|
|
|
RuntimeEnabledFeatures::SetTranslateServiceEnabled(
|
|
prefs.translate_service_available);
|
|
+
|
|
+ SkColor color = SK_ColorTRANSPARENT;
|
|
+ if (!prefs.guest_instance_id) { // not inside electron <webview /> tag, which is always transparent.
|
|
+ Color blink_color;
|
|
+ if (blink_color.SetFromString(WebString::FromASCII(prefs.background_color)))
|
|
+ color = static_cast<SkColor>(blink_color);
|
|
+ }
|
|
+ web_view->SetBaseBackgroundColor(color);
|
|
+
|
|
+ SetUseExternalPopupMenus(!prefs.offscreen);
|
|
}
|
|
|
|
void WebViewImpl::ThemeChanged() {
|