Remove OverlayScrollbarSizeRelevancy.

sky/engine/core/rendering/RenderLayerClipper.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 46 matching lines @@
     } else if (position == AbsolutePosition) {
         clipRects.setOverflowClipRect(clipRects.posClipRect());
     }
 }
 
 static void applyClipRects(const ClipRectsContext& context, RenderObject& renderer, LayoutPoint offset, ClipRects& clipRects)
 {
     ASSERT(renderer.hasOverflowClip() || renderer.hasClip());
 
     if (renderer.hasOverflowClip()) {
-        ClipRect newOverflowClip = toRenderBox(renderer).overflowClipRect(offset, context.scrollbarRelevancy);
+        ClipRect newOverflowClip = toRenderBox(renderer).overflowClipRect(offset);
         newOverflowClip.setHasRadius(renderer.style()->hasBorderRadius());
         clipRects.setOverflowClipRect(intersection(newOverflowClip, clipRects.overflowClipRect()));
         if (renderer.isPositioned())
             clipRects.setPosClipRect(intersection(newOverflowClip, clipRects.posClipRect()));
     }
 
     if (renderer.hasClip()) {
         LayoutRect newClip = toRenderBox(renderer).clipRect(offset);
         clipRects.setPosClipRect(intersection(newClip, clipRects.posClipRect()));
         clipRects.setOverflowClipRect(intersection(newClip, clipRects.overflowClipRect()));
     }
 }
 
 RenderLayerClipper::RenderLayerClipper(RenderLayerModelObject& renderer)
     : m_renderer(renderer)
 {
 }
 
 ClipRects* RenderLayerClipper::clipRectsIfCached(const ClipRectsContext& context) const
 {
     ASSERT(context.usesCache());
     if (!m_cache)
         return 0;
     ClipRectsCache::Entry& entry = m_cache->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);
 
 #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;
     ClipRects clipRects;
     calculateClipRects(tempContext, clipRects);
     ASSERT(clipRects == *entry.clipRects);
 #endif
 
     return entry.clipRects.get();
 }
 
 ClipRects* RenderLayerClipper::storeClipRectsInCache(const ClipRectsContext& context, ClipRects* parentClipRects, const ClipRects& clipRects) const
 {
     ClipRectsCache::Entry& entry = cache().get(context.cacheSlot);
     entry.root = context.rootLayer;
-#if ENABLE(ASSERT)
-    entry.scrollbarRelevancy = context.scrollbarRelevancy;
-#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);
@@ skipping 87 matching lines @@
     if (offsetFromRoot)
         offset = *offsetFromRoot;
     else
         m_renderer.layer()->convertToLayerCoords(context.rootLayer, offset);
     layerBounds = LayoutRect(offset, m_renderer.layer()->size());
 
     // Update the clip rects that will be passed to child layers.
     if (m_renderer.hasOverflowClip()) {
         // This layer establishes a clip of some kind.
         if (!isClippingRoot || context.respectOverflowClip == RespectOverflowClip) {
-            foregroundRect.intersect(toRenderBox(m_renderer).overflowClipRect(offset, context.scrollbarRelevancy));
+            foregroundRect.intersect(toRenderBox(m_renderer).overflowClipRect(offset));
             if (m_renderer.style()->hasBorderRadius())
                 foregroundRect.setHasRadius(true);
         }
 
         // If we establish an overflow clip at all, then go ahead and make sure our background
         // rect is intersected with our layer's bounds including our visual overflow,
         // since any visual overflow like box-shadow or border-outset is not clipped by overflow:auto/hidden.
         if (toRenderBox(m_renderer).hasVisualOverflow()) {
             // FIXME: Perhaps we should be propagating the borderbox as the clip rect for children, even though
             //        we may need to inflate our clip specifically for shadows or outsets.
@@ skipping 105 matching lines @@
         ASSERT(current);
         if (current->transform() || current->isPaintInvalidationContainer())
             return const_cast<RenderLayer*>(current);
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 } // namespace blink