Fix difference in Fluent scrollbar grays caused by their alpha
Fluent scrollbars grays are currently achieved by applying a certain
transparency to a pure white (255, 255, 255) or black (0,0,0) color.
This CL changes the way to achieve the desired color from applying an
alpha to a white or black, to directly setting the color of the gray
that we want with an alpha of 1.
The reason for this change is that the transparencies cause light mode
scrollbar gray parts (non-hovered) to be painted with different shades
of gray. Main threaded thumbs are being drawn at a shade of gray darker
than composited scrollbars' thumbs, and win10 arrows are also being
drawn with a darker gray.
This doesn't happen in dark mode, nor with the hovered/pressed colors,
but these colors are receiving the same treatment in order to avoid
potential future problems.
The new colors were chosen by picking the final rendered color of
the scrollbar parts. For example, light themed non-hovered gray is a
gray with the RGB values (139,139,139).
The root cause of this issue is suspected to be caused by a different
rounding mechanism used to apply the alpha in the different call ops.
For example, for win10 vs win11 arrows, the color is the same but the
skia paint function called is different (see
NativeThemeFluent::PaintArrow).
Most rebaselines are due to a few anti aliasing pixels containing
different values, except for win10 arrows and main threaded thumbs
which are completely replaced by the new selected color.
Bug: 1517769
Change-Id: Ic258a0e3a26a8bee96c005df6c721a4f6ab1f582
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5191003
Reviewed-by: Yaroslav Shalivskyy <yshalivskyy@microsoft.com>
Reviewed-by: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Xianzhu Wang <wangxianzhu@chromium.org>
Reviewed-by: Olga Gerchikov <gerchiko@microsoft.com>
Commit-Queue: Gaston Rodriguez <gastonr@microsoft.com>
Cr-Commit-Position: refs/heads/main@{#1253636}
diff --git a/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc b/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
index 35940cf..285838a 100644
--- a/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
+++ b/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
@@ -34,7 +34,6 @@
#include "build/chromeos_buildflags.h"
#include "cc/input/scrollbar.h"
#include "third_party/blink/public/common/input/web_mouse_event.h"
-#include "third_party/blink/public/platform/web_theme_engine.h"
#include "third_party/blink/renderer/core/scroll/scrollable_area.h"
#include "third_party/blink/renderer/core/scroll/scrollbar.h"
#include "third_party/blink/renderer/core/scroll/scrollbar_theme_fluent.h"
@@ -312,24 +311,18 @@
WebThemeEngine::State state;
cc::PaintCanvas* canvas = gc.Canvas();
- if (scrollbar.PressedPart() == kThumbPart)
+ if (scrollbar.PressedPart() == kThumbPart) {
state = WebThemeEngine::kStatePressed;
- else if (scrollbar.HoveredPart() == kThumbPart)
+ } else if (scrollbar.HoveredPart() == kThumbPart) {
state = WebThemeEngine::kStateHover;
- else
+ } else {
state = WebThemeEngine::kStateNormal;
-
- WebThemeEngine::ScrollbarThumbExtraParams scrollbar_thumb;
-
- if (scrollbar.ScrollbarThumbColor().has_value()) {
- scrollbar_thumb.thumb_color =
- scrollbar.ScrollbarThumbColor().value().toSkColor4f().toSkColor();
}
- WebThemeEngine::ExtraParams params(scrollbar_thumb);
mojom::blink::ColorScheme color_scheme = scrollbar.UsedColorScheme();
const ui::ColorProvider* color_provider =
scrollbar.GetScrollableArea()->GetColorProvider(color_scheme);
+ WebThemeEngine::ExtraParams params(BuildScrollbarThumbExtraParams(scrollbar));
WebThemeEngineHelper::GetNativeThemeEngine()->Paint(
canvas,
@@ -339,6 +332,18 @@
state, rect, ¶ms, color_scheme, color_provider);
}
+WebThemeEngine::ScrollbarThumbExtraParams
+ScrollbarThemeAura::BuildScrollbarThumbExtraParams(const Scrollbar& scrollbar) {
+ WebThemeEngine::ScrollbarThumbExtraParams scrollbar_thumb;
+
+ if (scrollbar.ScrollbarThumbColor().has_value()) {
+ scrollbar_thumb.thumb_color =
+ scrollbar.ScrollbarThumbColor().value().toSkColor4f().toSkColor();
+ }
+
+ return scrollbar_thumb;
+}
+
bool ScrollbarThemeAura::ShouldRepaintAllPartsOnInvalidation() const {
// This theme can separately handle thumb invalidation.
return false;
diff --git a/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.h b/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.h
index 908ea1c..644c4183 100644
--- a/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.h
+++ b/third_party/blink/renderer/core/scroll/scrollbar_theme_aura.h
@@ -32,6 +32,7 @@
#define THIRD_PARTY_BLINK_RENDERER_CORE_SCROLL_SCROLLBAR_THEME_AURA_H_
#include "base/gtest_prod_util.h"
+#include "third_party/blink/public/platform/web_theme_engine.h"
#include "third_party/blink/renderer/core/core_export.h"
#include "third_party/blink/renderer/core/scroll/scrollbar_theme.h"
@@ -61,6 +62,8 @@
void PaintThumb(GraphicsContext&,
const Scrollbar&,
const gfx::Rect&) override;
+ virtual WebThemeEngine::ScrollbarThumbExtraParams
+ BuildScrollbarThumbExtraParams(const Scrollbar&);
bool ShouldRepaintAllPartsOnInvalidation() const override;
ScrollbarPart PartsToInvalidateOnThumbPositionChange(
diff --git a/third_party/blink/renderer/core/scroll/scrollbar_theme_fluent.cc b/third_party/blink/renderer/core/scroll/scrollbar_theme_fluent.cc
index 17d2edd..3d7dc5d 100644
--- a/third_party/blink/renderer/core/scroll/scrollbar_theme_fluent.cc
+++ b/third_party/blink/renderer/core/scroll/scrollbar_theme_fluent.cc
@@ -5,6 +5,7 @@
#include "third_party/blink/renderer/core/scroll/scrollbar_theme_fluent.h"
#include "base/numerics/safe_conversions.h"
+#include "third_party/blink/public/common/css/forced_colors.h"
#include "third_party/blink/public/platform/web_theme_engine.h"
#include "third_party/blink/renderer/core/scroll/scrollable_area.h"
#include "third_party/blink/renderer/core/scroll/scrollbar.h"
@@ -161,6 +162,24 @@
UsesOverlayScrollbars() ? InsetButtonRect(scrollbar, rect, part) : rect,
part);
}
+WebThemeEngine::ScrollbarThumbExtraParams
+ScrollbarThemeFluent::BuildScrollbarThumbExtraParams(
+ const Scrollbar& scrollbar) {
+ WebThemeEngine::ScrollbarThumbExtraParams scrollbar_thumb;
+ if (scrollbar.ScrollbarThumbColor().has_value()) {
+ scrollbar_thumb.thumb_color =
+ scrollbar.ScrollbarThumbColor().value().toSkColor4f().toSkColor();
+ } else if (scrollbar.IsFluentOverlayScrollbarMinimalMode() &&
+ WebThemeEngineHelper::GetNativeThemeEngine()->GetForcedColors() ==
+ ForcedColors::kNone) {
+ const bool dark_mode =
+ (scrollbar.UsedColorScheme() == mojom::blink::ColorScheme::kDark);
+ // TODO(crbug.com/1518945): Find a better way to define these colors.
+ scrollbar_thumb.thumb_color = dark_mode ? SkColorSetA(SK_ColorWHITE, 0x8B)
+ : SkColorSetA(SK_ColorBLACK, 0x72);
+ }
+ return scrollbar_thumb;
+}
gfx::Rect ScrollbarThemeFluent::InsetTrackRect(const Scrollbar& scrollbar,
gfx::Rect rect) const {
diff --git a/third_party/blink/renderer/core/scroll/scrollbar_theme_fluent.h b/third_party/blink/renderer/core/scroll/scrollbar_theme_fluent.h
index 4b9eca5..712562fc 100644
--- a/third_party/blink/renderer/core/scroll/scrollbar_theme_fluent.h
+++ b/third_party/blink/renderer/core/scroll/scrollbar_theme_fluent.h
@@ -46,6 +46,8 @@
const Scrollbar& scrollbar,
const gfx::Rect& rect,
ScrollbarPart part) override;
+ WebThemeEngine::ScrollbarThumbExtraParams BuildScrollbarThumbExtraParams(
+ const Scrollbar&) override;
base::TimeDelta OverlayScrollbarFadeOutDelay() const override;
base::TimeDelta OverlayScrollbarFadeOutDuration() const override;
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/dynamic-color-scheme-change-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/dynamic-color-scheme-change-expected.png
index fe0337f..91a22a5 100644
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/dynamic-color-scheme-change-expected.png
+++ b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/dynamic-color-scheme-change-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/horizontal-scrollbar-basic-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/horizontal-scrollbar-basic-expected.png
index 111dd848..9e15931c 100644
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/horizontal-scrollbar-basic-expected.png
+++ b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/horizontal-scrollbar-basic-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
index f2d562241..780b4801 100644
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
+++ b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dsf-150/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dsf-150/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
index c3bdf98..d0420648 100644
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dsf-150/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
+++ b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dsf-150/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dsf-200/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dsf-200/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
index ff4911c..5d8939a 100644
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dsf-200/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
+++ b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar-dsf-200/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
index 960c99e4..11a83ae 100644
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
+++ b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
index d9f44e0..4fe5ade 100644
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
+++ b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/main/basic-scrollbar-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/main/basic-scrollbar-expected.png
deleted file mode 100644
index 057510f1..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/main/basic-scrollbar-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
index 3f40f54..ff899005 100644
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
+++ b/third_party/blink/web_tests/platform/linux/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
index d3ab839..459ccdb 100644
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
+++ b/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
index f252174..36b2470 100644
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
+++ b/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
index fede6624..d5989bf 100644
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
+++ b/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/visual/hover-over-main-thread-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/visual/hover-over-main-thread-expected.png
deleted file mode 100644
index fede6624..0000000
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/visual/hover-over-main-thread-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/visual/scrollbar-show-tickmarks-expected.png b/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/visual/scrollbar-show-tickmarks-expected.png
index 69e8c78..f21681dd 100644
--- a/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/visual/scrollbar-show-tickmarks-expected.png
+++ b/third_party/blink/web_tests/platform/linux/virtual/fluent-overlay-scrollbar/visual/scrollbar-show-tickmarks-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/dynamic-color-scheme-change-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/dynamic-color-scheme-change-expected.png
index 1e725a8..91a22a5 100644
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/dynamic-color-scheme-change-expected.png
+++ b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/dynamic-color-scheme-change-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/horizontal-scrollbar-basic-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/horizontal-scrollbar-basic-expected.png
index 6fce538..9e15931c 100644
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/horizontal-scrollbar-basic-expected.png
+++ b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/horizontal-scrollbar-basic-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
index 9998a7ac..780b4801 100644
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
+++ b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dsf-150/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dsf-150/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
index c3bdf98..d0420648 100644
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dsf-150/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
+++ b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dsf-150/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dsf-200/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dsf-200/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
index fef6e2c..5d8939a 100644
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dsf-200/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
+++ b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar-dsf-200/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
index 6f2e7da..11a83ae 100644
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
+++ b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
index 3a4d822..4fe5ade 100644
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
+++ b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/main/basic-scrollbar-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/main/basic-scrollbar-expected.png
deleted file mode 100644
index 9c244f06..0000000
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/main/basic-scrollbar-expected.png
+++ /dev/null
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
index 3f40f54..ff899005 100644
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
+++ b/third_party/blink/web_tests/platform/win10/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
index def08fd..459ccdb 100644
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
+++ b/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
index 80e10855..36b2470 100644
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
+++ b/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
index fede6624..d5989bf 100644
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
+++ b/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar/visual/scrollbar-show-tickmarks-expected.png b/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar/visual/scrollbar-show-tickmarks-expected.png
index 1339a5f..f21681dd 100644
--- a/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar/visual/scrollbar-show-tickmarks-expected.png
+++ b/third_party/blink/web_tests/platform/win10/virtual/fluent-overlay-scrollbar/visual/scrollbar-show-tickmarks-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/dynamic-color-scheme-change-expected.png b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/dynamic-color-scheme-change-expected.png
index 0b51866..d0b4333 100644
--- a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/dynamic-color-scheme-change-expected.png
+++ b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/dynamic-color-scheme-change-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/horizontal-scrollbar-basic-expected.png b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/horizontal-scrollbar-basic-expected.png
index 25187918..f3b9c51 100644
--- a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/horizontal-scrollbar-basic-expected.png
+++ b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dark-mode/fast/forms/color-scheme/scrollbar/horizontal-scrollbar-basic-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
index 70b1e1b0..5a1044a 100644
--- a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
+++ b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dsf-150/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dsf-150/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
index d5e06e3..1f23983 100644
--- a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dsf-150/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
+++ b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dsf-150/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dsf-200/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dsf-200/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
index aee20560..ed6c64a 100644
--- a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dsf-200/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
+++ b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar-dsf-200/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
index 1903024..237bca9 100644
--- a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
+++ b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar/composited/basic-scrollbar-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
index a540807c..3281de9 100644
--- a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
+++ b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
index 981dff6..3ec74f28 100644
--- a/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
+++ b/third_party/blink/web_tests/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png b/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
index 5d7820c7..26b5115 100644
--- a/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
+++ b/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar-dark-mode/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png b/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
index 08fe71f..7cf823a 100644
--- a/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
+++ b/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/hover-over-scrollbar-thumb-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png b/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
index 8f30a60..6536695c 100644
--- a/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
+++ b/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar/virtual/fluent-non-overlay-scrollbar/main/hover-over-main-thread-expected.png
Binary files differ
diff --git a/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar/visual/scrollbar-show-tickmarks-expected.png b/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar/visual/scrollbar-show-tickmarks-expected.png
index 4cbf43e6..f188bfb9 100644
--- a/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar/visual/scrollbar-show-tickmarks-expected.png
+++ b/third_party/blink/web_tests/virtual/fluent-overlay-scrollbar/visual/scrollbar-show-tickmarks-expected.png
Binary files differ
diff --git a/ui/color/fluent_ui_color_mixer.cc b/ui/color/fluent_ui_color_mixer.cc
index 5a101753..e38a8f3 100644
--- a/ui/color/fluent_ui_color_mixer.cc
+++ b/ui/color/fluent_ui_color_mixer.cc
@@ -20,11 +20,11 @@
const bool dark_mode = key.color_mode == ColorProviderKey::ColorMode::kDark;
mixer[kColorWebNativeControlScrollbarArrowForeground] = {
- dark_mode ? SkColorSetA(SK_ColorWHITE, 0x8B)
- : SkColorSetA(SK_ColorBLACK, 0x72)};
+ dark_mode ? SkColorSetRGB(0x9F, 0x9F, 0x9F)
+ : SkColorSetRGB(0x8B, 0x8B, 0x8B)};
mixer[kColorWebNativeControlScrollbarArrowForegroundPressed] = {
- dark_mode ? SkColorSetA(SK_ColorWHITE, 0xC8)
- : SkColorSetA(SK_ColorBLACK, 0x9B)};
+ dark_mode ? SkColorSetRGB(0xD1, 0xD1, 0xD1)
+ : SkColorSetRGB(0x63, 0x63, 0x63)};
mixer[kColorWebNativeControlScrollbarCorner] = {
dark_mode ? SkColorSetRGB(0x2C, 0x2C, 0x2C)
: SkColorSetRGB(0xFC, 0xFC, 0xFC)};
