Refactor OverlayScrollbarSizeRelevancy into OverlayScrollbarClipBehavior

third_party/WebKit/Source/core/paint/PaintLayerClipper.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@web.de>
  *   Randall Jesup <rjesup@wgate.com>
@@ skipping 56 matching lines @@
 }
 
 static void applyClipRects(const ClipRectsContext& context, const LayoutBoxModelObject& layoutObject, LayoutPoint offset, ClipRects& clipRects)
 {
     ASSERT(layoutObject.hasClipRelatedProperty());
     LayoutView* view = layoutObject.view();
     ASSERT(view);
     if (clipRects.fixed() && context.rootLayer->layoutObject() == view)
         offset -= toIntSize(view->frameView()->scrollPosition());
     if (layoutObject.hasOverflowClip() || (layoutObject.styleRef().containsPaint() && layoutObject.isBox())) {
-        ClipRect newOverflowClip = toLayoutBox(layoutObject).overflowClipRect(offset, context.scrollbarRelevancy);
+        ClipRect newOverflowClip = toLayoutBox(layoutObject).overflowClipRect(offset, context.overlayScrollbarClipBehavior);
         newOverflowClip.setHasRadius(layoutObject.styleRef().hasBorderRadius());
         clipRects.setOverflowClipRect(intersection(newOverflowClip, clipRects.overflowClipRect()));
         if (layoutObject.isPositioned())
             clipRects.setPosClipRect(intersection(newOverflowClip, clipRects.posClipRect()));
         if (layoutObject.isLayoutView())
             clipRects.setFixedClipRect(intersection(newOverflowClip, clipRects.fixedClipRect()));
         if (layoutObject.styleRef().containsPaint()) {
             clipRects.setPosClipRect(intersection(newOverflowClip, clipRects.posClipRect()));
             clipRects.setFixedClipRect(intersection(newOverflowClip, clipRects.fixedClipRect()));
         }
@@ skipping 10 matching lines @@
 {
     ASSERT(context.usesCache());
     if (!m_layer.clipRectsCache())
         return nullptr;
     ClipRectsCache::Entry& entry = m_layer.clipRectsCache()->get(context.cacheSlot());
     // FIXME: We used to ASSERT that we always got a consistent root layer.
     // We should add a test that has an inconsistent root. See
     // http://crbug.com/366118 for an example.
     if (context.rootLayer != entry.root)
         return 0;
-    ASSERT(entry.scrollbarRelevancy == context.scrollbarRelevancy);
+    ASSERT(entry.overlayScrollbarClipBehavior == context.overlayScrollbarClipBehavior);
 #ifdef CHECK_CACHED_CLIP_RECTS
     // This code is useful to check cached clip rects, but is too expensive to leave enabled in debug builds by default.
     ClipRectsContext tempContext(context);
     tempContext.cacheSlot = UncachedClipRects;
     RefPtr<ClipRects> clipRects = ClipRects::create();
     calculateClipRects(tempContext, *clipRects);
     ASSERT(clipRects == *entry.clipRects);
 #endif
     return entry.clipRects.get();
 }
 
 ClipRects& PaintLayerClipper::storeClipRectsInCache(const ClipRectsContext& context, ClipRects* parentClipRects, const ClipRects& clipRects) const
 {
     ClipRectsCache::Entry& entry = m_layer.ensureClipRectsCache().get(context.cacheSlot());
     entry.root = context.rootLayer;
 #if ENABLE(ASSERT)
-    entry.scrollbarRelevancy = context.scrollbarRelevancy;
+    entry.overlayScrollbarClipBehavior = context.overlayScrollbarClipBehavior;
 #endif
     if (parentClipRects) {
         // If our clip rects match the clip rects of our parent, we share storage.
         if (clipRects == *parentClipRects) {
             entry.clipRects = parentClipRects;
             return *parentClipRects;
         }
     }
     entry.clipRects = ClipRects::create(clipRects);
     return *entry.clipRects;
@@ skipping 71 matching lines @@
     LayoutPoint offset;
     if (offsetFromRoot)
         offset = *offsetFromRoot;
     else
         m_layer.convertToLayerCoords(context.rootLayer, offset);
     layerBounds = LayoutRect(offset, LayoutSize(m_layer.size()));
 
     // Update the clip rects that will be passed to child layers.
     if ((layoutObject.hasOverflowClip() && shouldRespectOverflowClip(context))
         || (layoutObject.styleRef().containsPaint() && layoutObject.isBox())) {
-        foregroundRect.intersect(toLayoutBox(layoutObject).overflowClipRect(offset, context.scrollbarRelevancy));
+        foregroundRect.intersect(toLayoutBox(layoutObject).overflowClipRect(offset, context.overlayScrollbarClipBehavior));
         if (layoutObject.styleRef().hasBorderRadius())
             foregroundRect.setHasRadius(true);
 
         // FIXME: Does not do the right thing with columns yet, since we don't yet factor in the
         // individual column boxes as overflow.
 
         // The LayoutView is special since its overflow clipping rect may be larger than its box rect (crbug.com/492871).
         LayoutRect layerBoundsWithVisualOverflow = layoutObject.isLayoutView() ? toLayoutView(layoutObject).viewRect() : toLayoutBox(layoutObject).visualOverflowRect();
         toLayoutBox(layoutObject).flipForWritingMode(layerBoundsWithVisualOverflow); // PaintLayer are in physical coordinates, so the overflow has to be flipped.
         layerBoundsWithVisualOverflow.moveBy(offset);
@@ skipping 99 matching lines @@
 
 ClipRects& PaintLayerClipper::paintingClipRects(const PaintLayer* rootLayer, ShouldRespectOverflowClipType respectOverflowClip, const LayoutSize& subpixelAccumulation) const
 {
     ClipRectsContext context(rootLayer, PaintingClipRects, IgnoreOverlayScrollbarSize, subpixelAccumulation);
     if (respectOverflowClip == IgnoreOverflowClip)
         context.setIgnoreOverflowClip();
     return getClipRects(context);
 }
 
 } // namespace blink