Revert of Implement overlay scrollbar fade out for non-composited scrollers.

third_party/WebKit/Source/platform/scroll/ScrollbarThemeOverlay.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 54 matching lines @@
 }
 
 int ScrollbarThemeOverlay::scrollbarMargin() const {
   return m_scrollbarMargin;
 }
 
 bool ScrollbarThemeOverlay::usesOverlayScrollbars() const {
   return true;
 }
 
-double ScrollbarThemeOverlay::overlayScrollbarFadeOutDelaySeconds() const {
-  WebThemeEngine::ScrollbarStyle style;
-  Platform::current()->themeEngine()->getOverlayScrollbarStyle(&style);
-  return style.fadeOutDelaySeconds;
-}
-
-double ScrollbarThemeOverlay::overlayScrollbarFadeOutDurationSeconds() const {
-  WebThemeEngine::ScrollbarStyle style;
-  Platform::current()->themeEngine()->getOverlayScrollbarStyle(&style);
-  return style.fadeOutDurationSeconds;
-}
-
 int ScrollbarThemeOverlay::thumbPosition(const ScrollbarThemeClient& scrollbar,
                                          float scrollPosition) {
   if (!scrollbar.totalSize())
     return 0;
 
   int trackLen = trackLength(scrollbar);
   float proportion = static_cast<float>(scrollPosition) / scrollbar.totalSize();
   return round(proportion * trackLen);
 }
 
@@ skipping 59 matching lines @@
     if (scrollbar.isLeftSideVerticalScrollbar())
       thumbRect.setX(thumbRect.x() + m_scrollbarMargin);
   }
 
   if (m_useSolidColor) {
     context.fillRect(thumbRect, m_color);
     return;
   }
 
   WebThemeEngine::State state = WebThemeEngine::StateNormal;
-
-  if (!scrollbar.enabled())
-    state = WebThemeEngine::StateDisabled;
-  else if (scrollbar.pressedPart() == ThumbPart)
+  if (scrollbar.pressedPart() == ThumbPart)
     state = WebThemeEngine::StatePressed;
   else if (scrollbar.hoveredPart() == ThumbPart)
     state = WebThemeEngine::StateHover;
 
   WebCanvas* canvas = context.canvas();
 
   WebThemeEngine::Part part = WebThemeEngine::PartScrollbarHorizontalThumb;
   if (scrollbar.orientation() == VerticalScrollbar)
     part = WebThemeEngine::PartScrollbarVerticalThumb;
 
   blink::WebThemeEngine::ExtraParams params;
   params.scrollbarThumb.scrollbarTheme =
       static_cast<WebScrollbarOverlayColorTheme>(
           scrollbar.getScrollbarOverlayColorTheme());
 
   Platform::current()->themeEngine()->paint(canvas, part, state, WebRect(rect),
                                             &params);
 }
 
 ScrollbarPart ScrollbarThemeOverlay::hitTest(
     const ScrollbarThemeClient& scrollbar,
     const IntPoint& position) {
   if (m_allowHitTest == DisallowHitTest)
     return NoPart;
 
-  ScrollbarPart part = ScrollbarTheme::hitTest(scrollbar, position);
-  if (part != ThumbPart)
-    return NoPart;
-
-  return ThumbPart;
+  return ScrollbarTheme::hitTest(scrollbar, position);
 }
 
 ScrollbarThemeOverlay& ScrollbarThemeOverlay::mobileTheme() {
   static ScrollbarThemeOverlay* theme;
   if (!theme) {
     WebThemeEngine::ScrollbarStyle style = {3, 3, 0x80808080};  // default style
     if (Platform::current()->themeEngine()) {
       Platform::current()->themeEngine()->getOverlayScrollbarStyle(&style);
     }
     theme = new ScrollbarThemeOverlay(
         style.thumbThickness, style.scrollbarMargin,
         ScrollbarThemeOverlay::DisallowHitTest, Color(style.color));
   }
   return *theme;
 }
 
 }  // namespace blink