Revert of Clean up some NativeTheme code.

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 24 matching lines @@
 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};
 
+SkAlpha ThumbAlphaForState(NativeTheme::State state) {
+  bool overlay = IsOverlayScrollbarEnabled();
+  switch (state) {
+    case NativeTheme::kDisabled:
+      return 0x00;
+    case NativeTheme::kHovered:
+      return overlay ? kOverlayScrollbarAlphaHovered : 0x4D;
+    case NativeTheme::kNormal:
+      return overlay ? kOverlayScrollbarAlphaNormal : 0x33;
+    case NativeTheme::kPressed:
+      return overlay ? kOverlayScrollbarAlphaPressed : 0x80;
+    case NativeTheme::kNumStates:
+      break;
+  }
+
+  NOTREACHED();
+  return 0xFF;
+}
+
 const SkColor kTrackColor = SkColorSetRGB(0xF1, 0xF1, 0xF1);
 
 }  // namespace
 
 // static
 NativeTheme* NativeTheme::GetInstanceForWeb() {
-  return NativeThemeAura::web_instance();
-}
-
-#if !defined(OS_WIN)
-// static
-NativeTheme* NativeTheme::GetInstanceForNativeUi() {
   return NativeThemeAura::instance();
 }
-#endif
 
 // static
 NativeThemeAura* NativeThemeAura::instance() {
-  CR_DEFINE_STATIC_LOCAL(NativeThemeAura, s_native_theme, (false));
+  CR_DEFINE_STATIC_LOCAL(NativeThemeAura, s_native_theme, ());
   return &s_native_theme;
 }
 
-// static
-NativeThemeAura* NativeThemeAura::web_instance() {
-  CR_DEFINE_STATIC_LOCAL(NativeThemeAura, s_native_theme_for_web,
-                         (IsOverlayScrollbarEnabled()));
-  return &s_native_theme_for_web;
-}
-
-NativeThemeAura::NativeThemeAura(bool use_overlay_scrollbars)
-    : use_overlay_scrollbars_(use_overlay_scrollbars) {
+NativeThemeAura::NativeThemeAura() {
 // We don't draw scrollbar buttons.
 #if defined(OS_CHROMEOS)
   set_scrollbar_button_length(0);
 #endif
 
-  if (use_overlay_scrollbars_) {
+  if (IsOverlayScrollbarEnabled()) {
     scrollbar_width_ =
         kOverlayScrollbarThumbWidthPressed + kOverlayScrollbarStrokeWidth * 2;
   }
 
   // Images and alphas declarations assume the following order.
   static_assert(kDisabled == 0, "states unexpectedly changed");
   static_assert(kHovered == 1, "states unexpectedly changed");
   static_assert(kNormal == 2, "states unexpectedly changed");
   static_assert(kPressed == 3, "states unexpectedly changed");
 }
@@ skipping 71 matching lines @@
   PaintArrow(canvas, rect, direction, arrow_color);
 }
 
 void NativeThemeAura::PaintScrollbarTrack(
     SkCanvas* canvas,
     Part part,
     State state,
     const ScrollbarTrackExtraParams& extra_params,
     const gfx::Rect& rect) const {
   // Overlay Scrollbar should never paint a scrollbar track.
-  DCHECK(!use_overlay_scrollbars_);
+  DCHECK(!IsOverlayScrollbarEnabled());
   SkPaint paint;
   paint.setColor(kTrackColor);
   canvas->drawIRect(gfx::RectToSkIRect(rect), paint);
 }
 
 void NativeThemeAura::PaintScrollbarThumb(
     SkCanvas* canvas,
     Part part,
     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) {
+  SkAlpha thumb_alpha = ThumbAlphaForState(state);
+
+  if (IsOverlayScrollbarEnabled()) {
     thumb_color = kOverlayScrollbarThumbColor[theme];
 
     // In overlay mode, draw a stroke (border).
     constexpr int kStrokeWidth = kOverlayScrollbarStrokeWidth;
     SkPaint paint;
     paint.setColor(
         SkColorSetA(kOverlayScrollbarStrokeColor[theme], thumb_alpha));
     paint.setStyle(SkPaint::kStroke_Style);
     paint.setStrokeWidth(kStrokeWidth);
 
@@ skipping 20 matching lines @@
 
   SkPaint paint;
   paint.setColor(SkColorSetA(thumb_color, thumb_alpha));
   canvas->drawIRect(gfx::RectToSkIRect(thumb_rect), paint);
 }
 
 void NativeThemeAura::PaintScrollbarCorner(SkCanvas* canvas,
                                            State state,
                                            const gfx::Rect& rect) const {
   // Overlay Scrollbar should never paint a scrollbar corner.
-  DCHECK(!use_overlay_scrollbars_);
+  DCHECK(!IsOverlayScrollbarEnabled());
   SkPaint paint;
   paint.setColor(SkColorSetRGB(0xDC, 0xDC, 0xDC));
   canvas->drawIRect(RectToSkIRect(rect), paint);
 }
 
 gfx::Size NativeThemeAura::GetPartSize(Part part,
                                        State state,
                                        const ExtraParams& extra) const {
-  if (use_overlay_scrollbars_) {
+  if (IsOverlayScrollbarEnabled()) {
     constexpr int minimum_length =
         kOverlayScrollbarMinimumLength + 2 * kOverlayScrollbarStrokeWidth;
 
     // Aura overlay scrollbars need a slight tweak from the base sizes.
     switch (part) {
       case kScrollbarHorizontalThumb:
         return gfx::Size(minimum_length, scrollbar_width_);
       case kScrollbarVerticalThumb:
         return gfx::Size(scrollbar_width_, minimum_length);
-
       default:
         // TODO(bokan): We should probably make sure code using overlay
-        // scrollbars isn't asking for part sizes that don't exist.
+        // scrollbars isn't asking for part sizes that don't exist. This
+        // currently breaks in Views layout code which indicates they aren't
+        // overlay aware yet. The Views code should be fixed and either this
+        // branch return 0 for parts that don't exist or assert NOTREACHED.
         // crbug.com/657159.
         break;
     }
   }
 
   return NativeThemeBase::GetPartSize(part, state, extra);
 }
 
 }  // namespace ui