Use scrollbar thickness to set layout

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 472 matching lines @@
   return -scrollOrigin() + (contentSize - visibleSize);
 }
 
 IntRect PaintLayerScrollableArea::visibleContentRect(
     IncludeScrollbarsInRect scrollbarInclusion) const {
   int verticalScrollbarWidth = 0;
   int horizontalScrollbarHeight = 0;
   if (scrollbarInclusion == IncludeScrollbars) {
     verticalScrollbarWidth =
         (verticalScrollbar() && !verticalScrollbar()->isOverlayScrollbar())
-            ? verticalScrollbar()->width()
+            ? verticalScrollbar()->scrollbarThickness()
             : 0;
     horizontalScrollbarHeight =
         (horizontalScrollbar() && !horizontalScrollbar()->isOverlayScrollbar())
-            ? horizontalScrollbar()->height()
+            ? horizontalScrollbar()->scrollbarThickness()
             : 0;
   }
 
   return IntRect(
       IntPoint(scrollXOffset(), scrollYOffset()),
       IntSize(max(0, layer()->size().width() - verticalScrollbarWidth),
               max(0, layer()->size().height() - horizontalScrollbarHeight)));
 }
 
 int PaintLayerScrollableArea::visibleHeight() const {
@@ skipping 487 matching lines @@
 
 IntRect PaintLayerScrollableArea::rectForHorizontalScrollbar(
     const IntRect& borderBoxRect) const {
   if (!hasHorizontalScrollbar())
     return IntRect();
 
   const IntRect& scrollCorner = scrollCornerRect();
 
   return IntRect(horizontalScrollbarStart(borderBoxRect.x()),
                  borderBoxRect.maxY() - box().borderBottom() -
-                     horizontalScrollbar()->height(),
+                     horizontalScrollbar()->scrollbarThickness(),
                  borderBoxRect.width() -
                      (box().borderLeft() + box().borderRight()) -
                      scrollCorner.width(),
                  horizontalScrollbar()->scrollbarThickness());
 }
 
 IntRect PaintLayerScrollableArea::rectForVerticalScrollbar(
     const IntRect& borderBoxRect) const {
   if (!hasVerticalScrollbar())
     return IntRect();
 
   const IntRect& scrollCorner = scrollCornerRect();
 
   return IntRect(
       verticalScrollbarStart(borderBoxRect.x(), borderBoxRect.maxX()),
       borderBoxRect.y() + box().borderTop(),
       verticalScrollbar()->scrollbarThickness(),
       borderBoxRect.height() - (box().borderTop() + box().borderBottom()) -
           scrollCorner.height());
 }
 
 int PaintLayerScrollableArea::verticalScrollbarStart(int minX, int maxX) const {
   if (box().shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
     return minX + box().borderLeft();
-  return maxX - box().borderRight() - verticalScrollbar()->width();
+  return maxX - box().borderRight() - verticalScrollbar()->scrollbarThickness();
 }
 
 int PaintLayerScrollableArea::horizontalScrollbarStart(int minX) const {
   int x = minX + box().borderLeft();
   if (box().shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
     x += hasVerticalScrollbar()
-             ? verticalScrollbar()->width()
+             ? verticalScrollbar()->scrollbarThickness()
              : resizerCornerRect(box().pixelSnappedBorderBoxRect(),
                                  ResizerForPointer)
                    .width();
   return x;
 }
 
 IntSize PaintLayerScrollableArea::scrollbarOffset(
     const Scrollbar& scrollbar) const {
   if (&scrollbar == verticalScrollbar())
     return IntSize(verticalScrollbarStart(0, box().size().width().toInt()),
@@ skipping 136 matching lines @@
 }
 
 int PaintLayerScrollableArea::verticalScrollbarWidth(
     OverlayScrollbarClipBehavior overlayScrollbarClipBehavior) const {
   if (!hasVerticalScrollbar())
     return 0;
   if (verticalScrollbar()->isOverlayScrollbar() &&
       (overlayScrollbarClipBehavior == IgnoreOverlayScrollbarSize ||
        !verticalScrollbar()->shouldParticipateInHitTesting()))
     return 0;
-  return verticalScrollbar()->width();
+  return verticalScrollbar()->scrollbarThickness();
 }
 
 int PaintLayerScrollableArea::horizontalScrollbarHeight(
     OverlayScrollbarClipBehavior overlayScrollbarClipBehavior) const {
   if (!hasHorizontalScrollbar())
     return 0;
   if (horizontalScrollbar()->isOverlayScrollbar() &&
       (overlayScrollbarClipBehavior == IgnoreOverlayScrollbarSize ||
        !horizontalScrollbar()->shouldParticipateInHitTesting()))
     return 0;
-  return horizontalScrollbar()->height();
+  return horizontalScrollbar()->scrollbarThickness();
 }
 
 void PaintLayerScrollableArea::positionOverflowControls() {
   if (!hasScrollbar() && !box().canResize())
     return;
 
   const IntRect borderBox = box().pixelSnappedBorderBoxRect();
   if (Scrollbar* verticalScrollbar = this->verticalScrollbar())
     verticalScrollbar->setFrameRect(rectForVerticalScrollbar(borderBox));
 
@@ skipping 51 matching lines @@
   if (box().style()->resize() != RESIZE_NONE) {
     resizeControlRect =
         resizerCornerRect(box().pixelSnappedBorderBoxRect(), ResizerForPointer);
     if (resizeControlRect.contains(localPoint))
       return true;
   }
 
   int resizeControlSize = max(resizeControlRect.height(), 0);
   if (hasVerticalScrollbar() &&
       verticalScrollbar()->shouldParticipateInHitTesting()) {
-    LayoutRect vBarRect(
-        verticalScrollbarStart(0, box().size().width().toInt()),
-        box().borderTop(), verticalScrollbar()->width(),
-        box().size().height().toInt() -
-            (box().borderTop() + box().borderBottom()) -
-            (hasHorizontalScrollbar() ? horizontalScrollbar()->height()
-                                      : resizeControlSize));
+    LayoutRect vBarRect(verticalScrollbarStart(0, box().size().width().toInt()),
+                        box().borderTop(),
+                        verticalScrollbar()->scrollbarThickness(),
+                        box().size().height().toInt() -
+                            (box().borderTop() + box().borderBottom()) -
+                            (hasHorizontalScrollbar()
+                                 ? horizontalScrollbar()->scrollbarThickness()
+                                 : resizeControlSize));
     if (vBarRect.contains(localPoint)) {
       result.setScrollbar(verticalScrollbar());
       return true;
     }
   }
 
   resizeControlSize = max(resizeControlRect.width(), 0);
   if (hasHorizontalScrollbar() &&
       horizontalScrollbar()->shouldParticipateInHitTesting()) {
     // TODO(crbug.com/638981): Are the conversions to int intentional?
     LayoutRect hBarRect(
         horizontalScrollbarStart(0),
         (box().size().height() - box().borderBottom() -
-         horizontalScrollbar()->height())
+         horizontalScrollbar()->scrollbarThickness())
             .toInt(),
         (box().size().width() - (box().borderLeft() + box().borderRight()) -
-         (hasVerticalScrollbar() ? verticalScrollbar()->width()
+         (hasVerticalScrollbar() ? verticalScrollbar()->scrollbarThickness()
                                  : resizeControlSize))
             .toInt(),
-        horizontalScrollbar()->height());
+        horizontalScrollbar()->scrollbarThickness());
     if (hBarRect.contains(localPoint)) {
       result.setScrollbar(horizontalScrollbar());
       return true;
     }
   }
 
   // FIXME: We should hit test the m_scrollCorner and pass it back through the result.
 
   return false;
 }
@@ skipping 637 matching lines @@
 
 void PaintLayerScrollableArea::DelayScrollPositionClampScope::
     clampScrollableAreas() {
   for (auto& scrollableArea : *s_needsClamp)
     scrollableArea->clampScrollPositionsAfterLayout();
   delete s_needsClamp;
   s_needsClamp = nullptr;
 }
 
 }  // namespace blink