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

third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp

Index: third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
diff --git a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
index 725188f23942ca386bbefb1c7627b99b08560639..b5ff43d9e63497e3970144fc3f3c584c8fc61f91 100644
--- a/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
+++ b/third_party/WebKit/Source/core/paint/PaintLayerScrollableArea.cpp
@@ -172,7 +172,7 @@
   if (m_resizer)
     m_resizer->destroy();
 
-  clearScrollableArea();
+  clearScrollAnimators();
 
   // Note: it is not safe to call ScrollAnchor::clear if the document is being
   // destroyed, because LayoutObjectChildList::removeChildNode skips the call to
@@ -368,7 +368,6 @@
   if (scrollOffset() == newOffset)
     return;
 
-  showOverlayScrollbars();
   ScrollOffset scrollDelta = scrollOffset() - newOffset;
   m_scrollOffset = newOffset;
 
@@ -516,10 +515,6 @@
               max(0, layer()->size().height() - horizontalScrollbarHeight)));
 }
 
-void PaintLayerScrollableArea::visibleSizeChanged() {
-  showOverlayScrollbars();
-}
-
 int PaintLayerScrollableArea::visibleHeight() const {
   return layer()->size().height();
 }
@@ -551,7 +546,6 @@
 }
 
 void PaintLayerScrollableArea::scrollbarVisibilityChanged() {
-  updateScrollbarsEnabledState();
   if (LayoutView* view = box().view())
     return view->clearHitTestCache();
 }
@@ -648,8 +642,6 @@
 }
 
 void PaintLayerScrollableArea::updateScrollDimensions() {
-  if (m_overflowRect.size() != box().layoutOverflowRect().size())
-    contentsResized();
   m_overflowRect = box().layoutOverflowRect();
   box().flipForWritingMode(m_overflowRect);
   updateScrollOrigin();
@@ -660,6 +652,10 @@
     ScrollType scrollType) {
   cancelScrollAnimation();
   scrollOffsetChanged(offset, scrollType);
+}
+
+void PaintLayerScrollableArea::didChangeScrollbarsHidden() {
+  updateScrollbarsEnabledState();
 }
 
 void PaintLayerScrollableArea::updateScrollbarsEnabledState() {