Disable overlay scrollbars to hide them on non-Mac.

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

 /*
  * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights
  * reserved.
  *
  * Portions are Copyright (C) 1998 Netscape Communications Corporation.
  *
  * Other contributors:
  *   Robert O'Callahan <roc+@cs.cmu.edu>
  *   David Baron <dbaron@fas.harvard.edu>
  *   Christian Biesinger <cbiesinger@gmail.com>
@@ skipping 533 matching lines @@
 }
 
 bool PaintLayerScrollableArea::shouldSuspendScrollAnimations() const {
   LayoutView* view = box().view();
   if (!view)
     return true;
   return view->frameView()->shouldSuspendScrollAnimations();
 }
 
 void PaintLayerScrollableArea::scrollbarVisibilityChanged() {
+  updateScrollbarEnabledState();
+
   if (LayoutView* view = box().view())
     return view->clearHitTestCache();
 }
 
 bool PaintLayerScrollableArea::scrollbarsCanBeActive() const {
   LayoutView* view = box().view();
   if (!view)
     return false;
   return view->frameView()->scrollbarsCanBeActive();
 }
@@ skipping 83 matching lines @@
 }
 
 void PaintLayerScrollableArea::updateScrollDimensions() {
   if (m_overflowRect.size() != box().layoutOverflowRect().size())
     contentsResized();
   m_overflowRect = box().layoutOverflowRect();
   box().flipForWritingMode(m_overflowRect);
   updateScrollOrigin();
 }
 
+void PaintLayerScrollableArea::updateScrollbarEnabledState() {
+  bool forceDisabled = ScrollbarTheme::theme().disableInvisibleScrollbars() &&
+                       scrollbarsHidden();
+  // overflow:scroll should just enable/disable.
+  if (box().style()->overflowX() == OverflowScroll && horizontalScrollbar()) {
+    horizontalScrollbar()->setEnabled(hasHorizontalOverflow() &&
+                                      !forceDisabled);
+  }
+  if (box().style()->overflowY() == OverflowScroll && verticalScrollbar()) {
+    verticalScrollbar()->setEnabled(hasVerticalOverflow() && !forceDisabled);
+  }
+}
+
 void PaintLayerScrollableArea::setScrollOffsetUnconditionally(
     const ScrollOffset& offset,
     ScrollType scrollType) {
   cancelScrollAnimation();
   scrollOffsetChanged(offset, scrollType);
 }
 
 void PaintLayerScrollableArea::updateAfterLayout() {
   DCHECK(box().hasOverflowClip());
 
@@ skipping 73 matching lines @@
       if (parent && parent->isFlexibleBox())
         toLayoutFlexibleBox(parent)->clearCachedMainSizeForChild(box());
     }
   }
 
   {
     // Hits in
     // compositing/overflow/automatically-opt-into-composited-scrolling-after-style-change.html.
     DisableCompositingQueryAsserts disabler;
 
-    // overflow:scroll should just enable/disable.
-    if (box().style()->overflowX() == OverflowScroll && horizontalScrollbar())
-      horizontalScrollbar()->setEnabled(hasHorizontalOverflow());
-    if (box().style()->overflowY() == OverflowScroll && verticalScrollbar())
-      verticalScrollbar()->setEnabled(hasVerticalOverflow());
+    updateScrollbarEnabledState();
 
     // Set up the range (and page step/line step).
     if (Scrollbar* horizontalScrollbar = this->horizontalScrollbar()) {
       int clientWidth = box().pixelSnappedClientWidth();
       horizontalScrollbar->setProportion(clientWidth,
                                          overflowRect().width().toInt());
     }
     if (Scrollbar* verticalScrollbar = this->verticalScrollbar()) {
       int clientHeight = box().pixelSnappedClientHeight();
       verticalScrollbar->setProportion(clientHeight,
@@ skipping 1202 matching lines @@
 
 void PaintLayerScrollableArea::DelayScrollOffsetClampScope::
     clampScrollableAreas() {
   for (auto& scrollableArea : *s_needsClamp)
     scrollableArea->clampScrollOffsetsAfterLayout();
   delete s_needsClamp;
   s_needsClamp = nullptr;
 }
 
 }  // namespace blink