Include auto vertical scrollbar in intrinsicScrollbarLogicalWidth.

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>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 624 matching lines @@
         // PaintLayerScrollableArea does not maintain that flag: it gets set, but it never
         // gets unset.  We should unset the flag after layout.
         scrollPositionChanged(scrollPositionDouble(), ProgrammaticScroll);
     }
 
     m_scrollbarManager.setCanDetachScrollbars(false);
 
     bool hasHorizontalOverflow = this->hasHorizontalOverflow();
     bool hasVerticalOverflow = this->hasVerticalOverflow();
 
+    // Don't add auto scrollbars if the box contents aren't visible.
+    bool shouldHaveAutoHorizontalScrollbar = hasHorizontalOverflow && box().pixelSnappedClientHeight();
+    bool shouldHaveAutoVerticalScrollbar = hasVerticalOverflow && box().pixelSnappedClientWidth();
+
     {
         // 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);
     }
 
     // We need to layout again if scrollbars are added or removed by overflow:auto,
     // or by changing between native and custom.
-    bool horizontalScrollBarChanged = (box().hasAutoHorizontalScrollbar() && (hasHorizontalScrollbar() != hasHorizontalOverflow))
+    bool horizontalScrollBarChanged = (box().hasAutoHorizontalScrollbar() && (hasHorizontalScrollbar() != shouldHaveAutoHorizontalScrollbar))
         || (box().style()->overflowX() == OverflowScroll && !horizontalScrollbar());
-    bool verticalScrollBarChanged = (box().hasAutoVerticalScrollbar() && (hasVerticalScrollbar() != hasVerticalOverflow))
+    bool verticalScrollBarChanged = (box().hasAutoVerticalScrollbar() && (hasVerticalScrollbar() != shouldHaveAutoVerticalScrollbar))
         || (box().style()->overflowY() == OverflowScroll && !verticalScrollbar());
-    if (!visualViewportSuppliesScrollbars() && (horizontalScrollBarChanged || verticalScrollBarChanged)) {
+    if (!m_inOverflowRelayout
+        && !visualViewportSuppliesScrollbars()
+        && (horizontalScrollBarChanged || verticalScrollBarChanged)) {
         if (box().hasAutoHorizontalScrollbar())
-            setHasHorizontalScrollbar(hasHorizontalOverflow);
+            setHasHorizontalScrollbar(shouldHaveAutoHorizontalScrollbar);
         else if (box().style()->overflowX() == OverflowScroll)
             setHasHorizontalScrollbar(true);
         if (box().hasAutoVerticalScrollbar())
-            setHasVerticalScrollbar(hasVerticalOverflow);
+            setHasVerticalScrollbar(shouldHaveAutoVerticalScrollbar);
         else if (box().style()->overflowY() == OverflowScroll)
             setHasVerticalScrollbar(true);
 
-        if (hasVerticalOverflow || hasHorizontalOverflow)
+        if (hasScrollbar())
             updateScrollCornerStyle();
 
         layer()->updateSelfPaintingLayer();
 
         // Force an update since we know the scrollbars have changed things.
         if (box().document().hasAnnotatedRegions())
             box().document().setAnnotatedRegionsDirty(true);
 
         // Our proprietary overflow: overlay value doesn't trigger a layout.
         if ((horizontalScrollBarChanged && box().style()->overflowX() != OverflowOverlay) || (verticalScrollBarChanged && box().style()->overflowY() != OverflowOverlay)) {
-            if (!m_inOverflowRelayout) {
+            if ((verticalScrollBarChanged && box().isHorizontalWritingMode())
+                || (horizontalScrollBarChanged && !box().isHorizontalWritingMode())) {
+                box().setPreferredLogicalWidthsDirty();
+            }
+            if (delayedLayoutScope) {
+                box().updateLogicalWidth();
+                if (box().isLayoutBlock())
+                    toLayoutBlock(box()).scrollbarsChanged(horizontalScrollBarChanged, verticalScrollBarChanged);
+                delayedLayoutScope->setNeedsLayout(&box(), LayoutInvalidationReason::ScrollbarChanged);
+                didMarkForDelayedLayout = true;
+            } else {
                 m_inOverflowRelayout = true;
-                if (delayedLayoutScope) {
-                    if (box().isLayoutBlock())
-                        toLayoutBlock(box()).scrollbarsChanged(horizontalScrollBarChanged, verticalScrollBarChanged);
-                    delayedLayoutScope->setNeedsLayout(&box(), LayoutInvalidationReason::ScrollbarChanged);
-                    didMarkForDelayedLayout = true;
+                SubtreeLayoutScope layoutScope(box());
+                layoutScope.setNeedsLayout(&box(), LayoutInvalidationReason::ScrollbarChanged);
+                if (box().isLayoutBlock()) {
+                    LayoutBlock& block = toLayoutBlock(box());
+                    block.scrollbarsChanged(horizontalScrollBarChanged, verticalScrollBarChanged);
+                    block.layoutBlock(true);
                 } else {
-                    SubtreeLayoutScope layoutScope(box());
-                    layoutScope.setNeedsLayout(&box(), LayoutInvalidationReason::ScrollbarChanged);
-                    if (box().isLayoutBlock()) {
-                        LayoutBlock& block = toLayoutBlock(box());
-                        block.scrollbarsChanged(horizontalScrollBarChanged, verticalScrollBarChanged);
-                        block.layoutBlock(true);
-                    } else {
-                        box().layout();
-                    }
+                    box().layout();
                 }
-                LayoutObject* parent = box().parent();
-                if (parent && parent->isFlexibleBox())
-                    toLayoutFlexibleBox(parent)->clearCachedMainSizeForChild(box());
                 m_inOverflowRelayout = false;
             }
+            LayoutObject* parent = box().parent();
+            if (parent && parent->isFlexibleBox())
+                toLayoutFlexibleBox(parent)->clearCachedMainSizeForChild(box());
         }
     }
 
     {
         // Hits in compositing/overflow/automatically-opt-into-composited-scrolling-after-style-change.html.
         DisableCompositingQueryAsserts disabler;
 
         // Set up the range (and page step/line step).
         if (Scrollbar* horizontalScrollbar = this->horizontalScrollbar()) {
             int clientWidth = box().pixelSnappedClientWidth();
@@ skipping 723 matching lines @@
     if (!layer->scrollsOverflow())
         return false;
 
     Node* node = layer->enclosingNode();
     if (node && node->isElementNode() && (toElement(node)->compositorMutableProperties() & (CompositorMutableProperty::kScrollTop | CompositorMutableProperty::kScrollLeft)))
         return true;
 
     if (mode == PaintLayerScrollableArea::ConsiderLCDText && !layer->compositor()->preferCompositingToLCDTextEnabled())
         return false;
 
-    return !layer->hasDescendantWithClipPath()
+    return !layer->size().isEmpty()
+        && !layer->hasDescendantWithClipPath()
         && !layer->hasAncestorWithClipPath()
         && !layer->layoutObject()->style()->hasBorderRadius();
 }
 
 void PaintLayerScrollableArea::updateNeedsCompositedScrolling(LCDTextMode mode)
 {
     const bool needsCompositedScrolling = layerNeedsCompositedScrolling(mode, layer());
     if (static_cast<bool>(m_needsCompositedScrolling) != needsCompositedScrolling) {
         m_needsCompositedScrolling = needsCompositedScrolling;
         layer()->didUpdateNeedsCompositedScrolling();
@@ skipping 151 matching lines @@
 }
 
 DEFINE_TRACE(PaintLayerScrollableArea::ScrollbarManager)
 {
     visitor->trace(m_scrollableArea);
     visitor->trace(m_hBar);
     visitor->trace(m_vBar);
 }
 
 } // namespace blink