Alpha for overlay scrollbars decreased when hovered.

ui/native_theme/native_theme_aura.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/native_theme/native_theme_aura.h"
 
 #include <limits>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 #include "ui/native_theme/overlay_scrollbar_constants_aura.h"
 
 namespace ui {
 
 namespace {
 
 // Constants for painting overlay scrollbars. Other properties needed outside
 // this painting code are defined in overlay_scrollbar_constants_aura.h.
 constexpr int kOverlayScrollbarStrokeWidth = 1;
 constexpr int kOverlayScrollbarMinimumLength = 12;
-constexpr SkAlpha kOverlayScrollbarAlphaNormal = 0x4D;
-constexpr SkAlpha kOverlayScrollbarAlphaHovered = 0x80;
-constexpr SkAlpha kOverlayScrollbarAlphaPressed = 0x80;
-
-// Indexed by ScrollbarOverlayColorTheme.
-constexpr SkColor kOverlayScrollbarThumbColor[] = {SK_ColorBLACK,
-                                                   SK_ColorWHITE};
-constexpr SkColor kOverlayScrollbarStrokeColor[] = {SK_ColorWHITE,
-                                                    SK_ColorBLACK};
 
 const SkColor kTrackColor = SkColorSetRGB(0xF1, 0xF1, 0xF1);
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeTheme:
 
 // static
 NativeTheme* NativeTheme::GetInstanceForWeb() {
@@ skipping 134 matching lines @@
     State state,
     const gfx::Rect& rect,
     ScrollbarOverlayColorTheme theme) const {
   // Do not paint if state is disabled.
   if (state == kDisabled)
     return;
 
   TRACE_EVENT0("blink", "NativeThemeAura::PaintScrollbarThumb");
 
   SkAlpha thumb_alpha = SK_AlphaTRANSPARENT;
-  const bool overlay = use_overlay_scrollbars_;
-  switch (state) {
-    case NativeTheme::kDisabled:
-      thumb_alpha = SK_AlphaTRANSPARENT;
-      break;
-    case NativeTheme::kHovered:
-      thumb_alpha = overlay ? kOverlayScrollbarAlphaHovered : 0x4D;
-      break;
-    case NativeTheme::kNormal:
-      thumb_alpha = overlay ? kOverlayScrollbarAlphaNormal : 0x33;
-      break;
-    case NativeTheme::kPressed:
-      thumb_alpha = overlay ? kOverlayScrollbarAlphaPressed : 0x80;
-      break;
-    case NativeTheme::kNumStates:
-      NOTREACHED();
-      break;
-  }
-
   gfx::Rect thumb_rect(rect);
   SkColor thumb_color;
-  if (overlay) {
+
+  if (use_overlay_scrollbars_) {
+    // Constants used for painting overlay scrollbar thumb.
+    constexpr SkAlpha kOverlayScrollbarFillAlphaNormal = 0x4D;
+    constexpr SkAlpha kOverlayScrollbarFillAlphaHovered = 0x80;
+    constexpr SkAlpha kOverlayScrollbarFillAlphaPressed = 0x80;
+    constexpr SkAlpha kOverlayScrollbarStrokeAlphaNormal = 0x4D;
+    constexpr SkAlpha kOverlayScrollbarStrokeAlphaHovered = 0x58;
+    constexpr SkAlpha kOverlayScrollbarStrokeAlphaPressed = 0x80;
+
+    // Indexed by ScrollbarOverlayColorTheme.
+    constexpr SkColor kOverlayScrollbarThumbColor[] = {SK_ColorBLACK,
+                                                       SK_ColorWHITE};
+    constexpr SkColor kOverlayScrollbarStrokeColor[] = {SK_ColorWHITE,
+                                                        SK_ColorBLACK};
+
     thumb_color = kOverlayScrollbarThumbColor[theme];
 
+    SkAlpha stroke_alpha = SK_AlphaTRANSPARENT;
+    switch (state) {
+      case NativeTheme::kDisabled:
+        thumb_alpha = SK_AlphaTRANSPARENT;
+        stroke_alpha = SK_AlphaTRANSPARENT;
+        break;
+      case NativeTheme::kHovered:
+        thumb_alpha = kOverlayScrollbarFillAlphaHovered;
+        stroke_alpha = kOverlayScrollbarStrokeAlphaHovered;
+        break;
+      case NativeTheme::kNormal:
+        thumb_alpha = kOverlayScrollbarFillAlphaNormal;
+        stroke_alpha = kOverlayScrollbarStrokeAlphaNormal;
+        break;
+      case NativeTheme::kPressed:
+        thumb_alpha = kOverlayScrollbarFillAlphaPressed;
+        stroke_alpha = kOverlayScrollbarStrokeAlphaPressed;
+        break;
+      case NativeTheme::kNumStates:
+        NOTREACHED();
+        break;
+    }
+
     // In overlay mode, draw a stroke (border).
     constexpr int kStrokeWidth = kOverlayScrollbarStrokeWidth;
     SkPaint paint;
     paint.setColor(
-        SkColorSetA(kOverlayScrollbarStrokeColor[theme], thumb_alpha));
+        SkColorSetA(kOverlayScrollbarStrokeColor[theme], stroke_alpha));
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setStrokeWidth(kStrokeWidth);
 
     gfx::RectF stroke_rect(thumb_rect);
     constexpr float kHalfStrokeWidth = kStrokeWidth / 2.f;
     stroke_rect.Inset(kHalfStrokeWidth, kHalfStrokeWidth);
     canvas->drawRect(gfx::RectFToSkRect(stroke_rect), paint);
 
     // Inset the all the edges edges so we fill-in the stroke below.
     thumb_rect.Inset(kStrokeWidth, kStrokeWidth);
   } else {
+    switch (state) {
+      case NativeTheme::kDisabled:
+        thumb_alpha = SK_AlphaTRANSPARENT;
+        break;
+      case NativeTheme::kHovered:
+        thumb_alpha = 0x4D;
+        break;
+      case NativeTheme::kNormal:
+        thumb_alpha = 0x33;
+        break;
+      case NativeTheme::kPressed:
+        thumb_alpha = 0x80;
+        break;
+      case NativeTheme::kNumStates:
+        NOTREACHED();
+        break;
+    }
     // If there are no scrollbuttons then provide some padding so that the thumb
     // doesn't touch the top of the track.
     const int kThumbPadding = 2;
     const int extra_padding =
         (scrollbar_button_length() == 0) ? kThumbPadding : 0;
     if (part == NativeTheme::kScrollbarVerticalThumb)
       thumb_rect.Inset(kThumbPadding, extra_padding);
     else
       thumb_rect.Inset(extra_padding, kThumbPadding);
 
@@ skipping 34 matching lines @@
         // scrollbars isn't asking for part sizes that don't exist.
         // crbug.com/657159.
         break;
     }
   }
 
   return NativeThemeBase::GetPartSize(part, state, extra);
 }
 
 }  // namespace ui