fix: BrowserWindow backgroundColor (#30819)

Co-authored-by: samuelmaddock <samuel.maddock@gmail.com>
electron · Sep 3, 2021 · cffc1a2 · cffc1a2
1 parent 9799589
commit cffc1a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/shell/browser/api/electron_api_browser_window.cc b/shell/browser/api/electron_api_browser_window.cc
@@ -362,9 +362,7 @@ void BrowserWindow::Blur() {
 
 void BrowserWindow::SetBackgroundColor(const std::string& color_name) {
   BaseWindow::SetBackgroundColor(color_name);
-  auto* view = web_contents()->GetRenderWidgetHostView();
-  if (view)
-    view->SetBackgroundColor(ParseHexColor(color_name));
+  web_contents()->SetPageBaseBackgroundColor(ParseHexColor(color_name));
   // Also update the web preferences object otherwise the view will be reset on
   // the next load URL call
   if (api_web_contents_) {

diff --git a/shell/browser/api/electron_api_web_contents.cc b/shell/browser/api/electron_api_web_contents.cc
@@ -1373,8 +1373,16 @@ void WebContents::HandleNewRenderFrame(
     std::string color_name;
     if (web_preferences->GetPreference(options::kBackgroundColor,
                                        &color_name)) {
-      rwhv->SetBackgroundColor(ParseHexColor(color_name));
+      web_contents()->SetPageBaseBackgroundColor(ParseHexColor(color_name));
     } else {
+      web_contents()->SetPageBaseBackgroundColor(absl::nullopt);
+    }
+
+    // When a page base background color is set, transparency needs to be
+    // explicitly set by calling
+    // RenderWidgetHostOwnerDelegate::SetBackgroundOpaque(false).
+    // RenderWidgetHostViewBase::SetBackgroundColor() will do this for us.
+    if (web_preferences->IsEnabled(options::kTransparent)) {
       rwhv->SetBackgroundColor(SK_ColorTRANSPARENT);
     }
   }