Revert "mac: Fix macOS 26 traffic light contrast for dark frames in light mode"

naeioi · Chromium LUCI CQ · commit 0d3971bcaace · 2025-10-20T10:51:51.000-07:00
This reverts commit f3c6fcb. Reason for revert: causes problem in window background blending on Win10 + ANGLE D3D11 for translucent windows. crbug.com/445485657 Original change's description: > mac: Fix macOS 26 traffic light contrast for dark frames in light mode > > In macOS 26, the window traffic light buttons can lose contrast and > become invisible on inactive windows. This occurs when the operating > system is in light mode while the window frame uses a dark background > color. > > It appears that this is because macOS is using a window's NSAppearance > to determine the traffic lights' color. Bad colors are chosen by the > system when a light appearance (NSAppearanceNameAqua) uses dark colors. > > To fix this, the window's NSAppearance is now set based on the luminance > of its frame color rather than the browser-wide theme. If the frame > color is dark, the window's appearance is now set to dark. > > Fixed: 442612600 > Change-Id: I65ac33324d2db2bec12a9a856fd0126fe265207e > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6914855 > Commit-Queue: Keren Zhu <kerenzhu@chromium.org> > Reviewed-by: Tom Lukaszewicz <tluk@chromium.org> > Cr-Commit-Position: refs/heads/main@{#1512214} Bug: 445485657 Change-Id: Iede19df3ebf832c71b8c6ca5a547361ff1308e00 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/7062815 Commit-Queue: Keren Zhu <kerenzhu@chromium.org> Reviewed-by: Tom Lukaszewicz <tluk@chromium.org> Cr-Commit-Position: refs/heads/main@{#1532391}
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
@@ -6009,11 +6009,6 @@ void BrowserView::FrameColorsChanged() {
     web_app_window_title_->SetBackgroundColor(frame_color);
     web_app_window_title_->SetEnabledColor(caption_color);
   }
-
-  ui::ColorId frame_color_id = browser_widget_->ShouldPaintAsActive()
-                                   ? ui::kColorFrameActive
-                                   : ui::kColorFrameInactive;
-  GetWidget()->SetBackgroundColor(frame_color_id);
 }
 
 void BrowserView::UpdateAccessibleNameForRootView() {
diff --git a/ui/views/test/mock_native_widget.h b/ui/views/test/mock_native_widget.h
@@ -72,7 +72,10 @@ class MockNativeWidget : public internal::NativeWidgetPrivate {
               InitModalType,
               (ui::mojom::ModalType modal_type),
               (override));
-  MOCK_METHOD(void, SetBackgroundColor, (SkColor background_color), (override));
+  MOCK_METHOD(void,
+              OnWidgetThemeChanged,
+              (ui::ColorProviderKey::ColorMode, std::optional<SkColor>),
+              (override));
   MOCK_METHOD(gfx::Rect, GetWindowBoundsInScreen, (), (const override));
   MOCK_METHOD(gfx::Rect, GetClientAreaBoundsInScreen, (), (const override));
   MOCK_METHOD(gfx::Rect, GetRestoredBounds, (), (const override));
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -869,8 +869,10 @@ void DesktopNativeWidgetAura::InitModalType(ui::mojom::ModalType modal_type) {
   desktop_window_tree_host_->InitModalType(modal_type);
 }
 
-void DesktopNativeWidgetAura::SetBackgroundColor(SkColor background_color) {
-  desktop_window_tree_host_->SetBackgroundColor(background_color);
+void DesktopNativeWidgetAura::OnWidgetThemeChanged(
+    ui::ColorProviderKey::ColorMode color_mode,
+    std::optional<SkColor> background_color) {
+  desktop_window_tree_host_->OnWidgetThemeChanged(color_mode, background_color);
 }
 
 gfx::Rect DesktopNativeWidgetAura::GetWindowBoundsInScreen() const {
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.h b/ui/views/widget/desktop_aura/desktop_native_widget_aura.h
@@ -155,7 +155,8 @@ class VIEWS_EXPORT DesktopNativeWidgetAura
   void SetWindowIcons(const gfx::ImageSkia& window_icon,
                       const gfx::ImageSkia& app_icon) override;
   void InitModalType(ui::mojom::ModalType modal_type) override;
-  void SetBackgroundColor(SkColor background_color) override;
+  void OnWidgetThemeChanged(ui::ColorProviderKey::ColorMode color_mode,
+                            std::optional<SkColor> background_color) override;
   gfx::Rect GetWindowBoundsInScreen() const override;
   gfx::Rect GetClientAreaBoundsInScreen() const override;
   gfx::Rect GetRestoredBounds() const override;
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host.h b/ui/views/widget/desktop_aura/desktop_window_tree_host.h
@@ -68,6 +68,10 @@ class VIEWS_EXPORT DesktopWindowTreeHost {
   // Called from DesktopNativeWidgetAura::OnWidgetInitDone().
   virtual void OnWidgetInitDone() = 0;
 
+  virtual void OnWidgetThemeChanged(
+      ui::ColorProviderKey::ColorMode color_mode,
+      std::optional<SkColor> background_color) = 0;
+
   // Called from DesktopNativeWidgetAura::OnWindowActivated().
   // `active`: if `DesktopNativeWidgetAura::content_window()` contains the
   // `aura::Window` that gains active.
@@ -190,8 +194,6 @@ class VIEWS_EXPORT DesktopWindowTreeHost {
 
   virtual void SetOpacity(float opacity) = 0;
 
-  virtual void SetBackgroundColor(SkColor background_color) = 0;
-
   // See NativeWidgetPrivate::SetAspectRatio for more information about what
   // `excluded_margin` does.
   virtual void SetAspectRatio(const gfx::SizeF& aspect_ratio,
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
@@ -329,8 +329,9 @@ void DesktopWindowTreeHostPlatform::OnWidgetInitDone() {
       GetWindowMaskForClipping().isEmpty());
 }
 
-void DesktopWindowTreeHostPlatform::SetBackgroundColor(
-    SkColor background_color) {}
+void DesktopWindowTreeHostPlatform::OnWidgetThemeChanged(
+    ui::ColorProviderKey::ColorMode color_mode,
+    std::optional<SkColor> background_color) {}
 
 void DesktopWindowTreeHostPlatform::OnActiveWindowChanged(bool active) {
 #if BUILDFLAG(IS_OZONE)
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.h
@@ -70,6 +70,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
   void Init(const Widget::InitParams& params) override;
   void OnNativeWidgetCreated(const Widget::InitParams& params) override;
   void OnWidgetInitDone() override;
+  void OnWidgetThemeChanged(ui::ColorProviderKey::ColorMode color_mode,
+                            std::optional<SkColor> background_color) override;
   void OnActiveWindowChanged(bool active) override;
   std::unique_ptr<corewm::Tooltip> CreateTooltip() override;
   std::unique_ptr<aura::client::DragDropClient> CreateDragDropClient() override;
@@ -124,7 +126,6 @@ class VIEWS_EXPORT DesktopWindowTreeHostPlatform
   void SetFullscreen(bool fullscreen, int64_t display_id) override;
   bool IsFullscreen() const override;
   void SetOpacity(float opacity) override;
-  void SetBackgroundColor(SkColor background_color) override;
   void SetAspectRatio(const gfx::SizeF& aspect_ratio,
                       const gfx::Size& excluded_margin) override;
   void SetWindowIcons(const gfx::ImageSkia& window_icon,
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.cc
@@ -247,11 +247,15 @@ void DesktopWindowTreeHostWin::OnActiveWindowChanged(bool active) {}
 
 void DesktopWindowTreeHostWin::OnWidgetInitDone() {}
 
-void DesktopWindowTreeHostWin::SetBackgroundColor(SkColor background_color) {
+void DesktopWindowTreeHostWin::OnWidgetThemeChanged(
+    ui::ColorProviderKey::ColorMode color_mode,
+    std::optional<SkColor> background_color) {
   UpdateBackdropColorMode();
-  ClearBackgroundPaintBrush();
-  background_paint_brush_ =
-      CreateSolidBrush(skia::SkColorToCOLORREF(background_color));
+  if (background_color) {
+    ClearBackgroundPaintBrush();
+    background_paint_brush_ =
+        CreateSolidBrush(skia::SkColorToCOLORREF(*background_color));
+  }
 }
 
 std::unique_ptr<corewm::Tooltip> DesktopWindowTreeHostWin::CreateTooltip() {
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h b/ui/views/widget/desktop_aura/desktop_window_tree_host_win.h
@@ -99,6 +99,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
   void OnNativeWidgetCreated(const Widget::InitParams& params) override;
   void OnActiveWindowChanged(bool active) override;
   void OnWidgetInitDone() override;
+  void OnWidgetThemeChanged(ui::ColorProviderKey::ColorMode color_mode,
+                            std::optional<SkColor> background_color) override;
   std::unique_ptr<corewm::Tooltip> CreateTooltip() override;
   std::unique_ptr<aura::client::DragDropClient> CreateDragDropClient() override;
   void Close() override;
@@ -152,7 +154,6 @@ class VIEWS_EXPORT DesktopWindowTreeHostWin
   void SetFullscreen(bool fullscreen, int64_t target_display_id) override;
   bool IsFullscreen() const override;
   void SetOpacity(float opacity) override;
-  void SetBackgroundColor(SkColor background_color) override;
   void SetAspectRatio(const gfx::SizeF& aspect_ratio,
                       const gfx::Size& excluded_margin) override;
   void SetWindowIcons(const gfx::ImageSkia& window_icon,
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc
@@ -570,10 +570,12 @@ void NativeWidgetAura::InitModalType(ui::mojom::ModalType modal_type) {
   }
 }
 
-void NativeWidgetAura::SetBackgroundColor(SkColor background_color) {
+void NativeWidgetAura::OnWidgetThemeChanged(
+    ui::ColorProviderKey::ColorMode color_mode,
+    std::optional<SkColor> background_color) {
   // Intentional no-op.
-  // The window is drawn by views. The OS does not need to know about what
-  // background color the window is using.
+  // The window frame is drawn by views. The OS does not need to know about
+  // which color mode the window is using.
 }
 
 gfx::Rect NativeWidgetAura::GetWindowBoundsInScreen() const {
diff --git a/ui/views/widget/native_widget_aura.h b/ui/views/widget/native_widget_aura.h
@@ -114,7 +114,8 @@ class VIEWS_EXPORT NativeWidgetAura : public internal::NativeWidgetPrivate,
   void SetWindowIcons(const gfx::ImageSkia& window_icon,
                       const gfx::ImageSkia& app_icon) override;
   void InitModalType(ui::mojom::ModalType modal_type) override;
-  void SetBackgroundColor(SkColor background_color) override;
+  void OnWidgetThemeChanged(ui::ColorProviderKey::ColorMode color_mode,
+                            std::optional<SkColor> background_color) override;
   gfx::Rect GetWindowBoundsInScreen() const override;
   gfx::Rect GetClientAreaBoundsInScreen() const override;
   gfx::Rect GetRestoredBounds() const override;
diff --git a/ui/views/widget/native_widget_mac.h b/ui/views/widget/native_widget_mac.h
@@ -161,7 +161,8 @@ class VIEWS_EXPORT NativeWidgetMac : public internal::NativeWidgetPrivate,
   // Suppress warning about hiding virtual WidgetObserver::OnWidgetThemeChanged.
   // TODO(kerenzhu): Do not observe Widget in this class.
   using WidgetObserver::OnWidgetThemeChanged;
-  void SetBackgroundColor(SkColor background_color) override;
+  void OnWidgetThemeChanged(ui::ColorProviderKey::ColorMode color_mode,
+                            std::optional<SkColor> background_color) override;
   gfx::Rect GetWindowBoundsInScreen() const override;
   gfx::Rect GetClientAreaBoundsInScreen() const override;
   gfx::Rect GetRestoredBounds() const override;
diff --git a/ui/views/widget/native_widget_mac.mm b/ui/views/widget/native_widget_mac.mm
@@ -39,7 +39,6 @@
 #include "ui/events/gestures/gesture_recognizer.h"
 #include "ui/events/gestures/gesture_recognizer_impl_mac.h"
 #include "ui/events/gestures/gesture_types.h"
-#include "ui/gfx/color_utils.h"
 #include "ui/gfx/font_list.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #include "ui/gfx/native_ui_types.h"
@@ -574,19 +573,11 @@ void OnDidChangeFocus(View* focused_before, View* focused_now) override {
   // Everything happens upon show.
 }
 
-void NativeWidgetMac::SetBackgroundColor(SkColor background_color) {
+void NativeWidgetMac::OnWidgetThemeChanged(
+    ui::ColorProviderKey::ColorMode color_mode,
+    std::optional<SkColor> background_color) {
   if (ns_window_host_) {
-    // The NSAppearance of a NSWindow affects traffic light contrast. The
-    // NSAppearance is determined by the color mode set on the window host. In
-    // macOS 26, if the color mode is light but the window has a dark background
-    // color, traffic lights in inactive windows lose contrast and become
-    // invisible. Therefore, if an explicit `background_color` is available,
-    // override the color mode to match that background's luminance.
-    ui::ColorProviderKey::ColorMode frame_color_mode =
-        color_utils::IsDark(background_color)
-            ? ui::ColorProviderKey::ColorMode::kDark
-            : ui::ColorProviderKey::ColorMode::kLight;
-    ns_window_host_->SetColorMode(frame_color_mode);
+    ns_window_host_->SetColorMode(color_mode);
   }
 }
 
diff --git a/ui/views/widget/native_widget_private.h b/ui/views/widget/native_widget_private.h
@@ -184,9 +184,10 @@ class VIEWS_EXPORT NativeWidgetPrivate : public NativeWidget {
   // initially parented.
   virtual void InitModalType(ui::mojom::ModalType modal_type) = 0;
 
-  // Sets the color used to fill the native widget. The native widget may use
-  // this color to determine the border color and caption button colors.
-  virtual void SetBackgroundColor(SkColor background_color) = 0;
+  // Notifies the NativeWidget that the widget theme has changed.
+  virtual void OnWidgetThemeChanged(
+      ui::ColorProviderKey::ColorMode color_mode,
+      std::optional<SkColor> background_color) = 0;
 
   // See method documentation in Widget.
   virtual gfx::Rect GetWindowBoundsInScreen() const = 0;
diff --git a/ui/views/widget/widget.cc b/ui/views/widget/widget.cc
@@ -597,8 +597,10 @@ void Widget::Init(InitParams params) {
     parent_->OnChildAdded(this);
   }
 
-  native_widget_->SetBackgroundColor(
-      GetColorProvider()->GetColor(GetBackgroundColorId()));
+  native_widget_->OnWidgetThemeChanged(
+      GetColorMode(), background_color_ ? GetColorProvider()->GetColor(
+                                              background_color_.value())
+                                        : std::optional<SkColor>());
 
   UpdateAccessibleNameForRootView();
   native_theme_observation_.Observe(GetNativeTheme());
@@ -1472,8 +1474,10 @@ void Widget::ThemeChanged() {
   NotifyColorProviderChanged();
 
   if (native_widget_) {
-    native_widget_->SetBackgroundColor(
-        GetColorProvider()->GetColor(GetBackgroundColorId()));
+    native_widget_->OnWidgetThemeChanged(
+        GetColorMode(), background_color_ ? GetColorProvider()->GetColor(
+                                                background_color_.value())
+                                          : std::optional<SkColor>());
   }
 }
 
@@ -2411,10 +2415,7 @@ void Widget::SetColorModeOverride(
 void Widget::SetBackgroundColor(std::optional<ui::ColorId> background_color) {
   if (background_color != background_color_) {
     background_color_ = background_color;
-    if (native_widget_) {
-      native_widget_->SetBackgroundColor(
-          GetColorProvider()->GetColor(GetBackgroundColorId()));
-    }
+    ThemeChanged();
   }
 }
 
@@ -2822,10 +2823,6 @@ void Widget::SetClientContentsViewInternal(std::unique_ptr<View> view) {
   root_view_->LayoutImmediately();
 }
 
-ui::ColorId Widget::GetBackgroundColorId() const {
-  return background_color_.value_or(ui::kColorWindowBackground);
-}
-
 BEGIN_METADATA_BASE(Widget)
 ADD_READONLY_PROPERTY_METADATA(std::string_view, ClassName)
 ADD_READONLY_PROPERTY_METADATA(gfx::Rect, ClientAreaBoundsInScreen)
diff --git a/ui/views/widget/widget.h b/ui/views/widget/widget.h
@@ -1588,8 +1588,6 @@ class VIEWS_EXPORT Widget : public internal::NativeWidgetDelegate,
   // contents view, possibly removing and destroying that view.
   void SetClientContentsViewInternal(std::unique_ptr<View> view);
 
-  ui::ColorId GetBackgroundColorId() const;
-
   static DisableActivationChangeHandlingType
       g_disable_activation_change_handling_;
 

Original file line number	Diff line number	Diff line change
`@@ -6009,11 +6009,6 @@ void BrowserView::FrameColorsChanged() {`
`6009`	`6009`	`web_app_window_title_->SetBackgroundColor(frame_color);`
`6010`	`6010`	`web_app_window_title_->SetEnabledColor(caption_color);`
`6011`	`6011`	`}`
`6012`		`-`
`6013`		`- ui::ColorId frame_color_id = browser_widget_->ShouldPaintAsActive()`
`6014`		`- ? ui::kColorFrameActive`
`6015`		`- : ui::kColorFrameInactive;`
`6016`		`- GetWidget()->SetBackgroundColor(frame_color_id);`
`6017`	`6012`	`}`
`6018`	`6013`
`6019`	`6014`	`void BrowserView::UpdateAccessibleNameForRootView() {`
Original file line number	Diff line number	Diff line change
`@@ -869,8 +869,10 @@ void DesktopNativeWidgetAura::InitModalType(ui::mojom::ModalType modal_type) {`
`869`	`869`	`desktop_window_tree_host_->InitModalType(modal_type);`
`870`	`870`	`}`
`871`	`871`
`872`		`-void DesktopNativeWidgetAura::SetBackgroundColor(SkColor background_color) {`
`873`		`- desktop_window_tree_host_->SetBackgroundColor(background_color);`
	`872`	`+void DesktopNativeWidgetAura::OnWidgetThemeChanged(`
	`873`	`+ ui::ColorProviderKey::ColorMode color_mode,`
	`874`	`+ std::optional<SkColor> background_color) {`
	`875`	`+ desktop_window_tree_host_->OnWidgetThemeChanged(color_mode, background_color);`
`874`	`876`	`}`
`875`	`877`
`876`	`878`	`gfx::Rect DesktopNativeWidgetAura::GetWindowBoundsInScreen() const {`
Original file line number	Diff line number	Diff line change
`@@ -570,10 +570,12 @@ void NativeWidgetAura::InitModalType(ui::mojom::ModalType modal_type) {`
`570`	`570`	`}`
`571`	`571`	`}`
`572`	`572`
`573`		`-void NativeWidgetAura::SetBackgroundColor(SkColor background_color) {`
	`573`	`+void NativeWidgetAura::OnWidgetThemeChanged(`
	`574`	`+ ui::ColorProviderKey::ColorMode color_mode,`
	`575`	`+ std::optional<SkColor> background_color) {`
`574`	`576`	`// Intentional no-op.`
`575`		`- // The window is drawn by views. The OS does not need to know about what`
`576`		`- // background color the window is using.`
	`577`	`+ // The window frame is drawn by views. The OS does not need to know about`
	`578`	`+ // which color mode the window is using.`
`577`	`579`	`}`
`578`	`580`
`579`	`581`	`gfx::Rect NativeWidgetAura::GetWindowBoundsInScreen() const {`