Remove pagination hacks in RenderLayerClipper::backgroundClipRect

Source/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 290 matching lines @@
 
     if (position == AbsolutePosition)
         return parentRects.posClipRect();
 
     return parentRects.overflowClipRect();
 }
 
 ClipRect RenderLayerClipper::backgroundClipRect(const ClipRectsContext& context) const
 {
     ASSERT(m_renderer.layer()->parent());
+    ASSERT(m_renderer.view());
 
     ClipRects parentRects;
-
-    // If we cross into a different pagination context, then we can't rely on the cache.
-    // Just switch over to using UncachedClipRects.
-    if (context.usesCache() && m_renderer.layer()->parent()->enclosingPaginationLayer() != m_renderer.layer()->enclosingPaginationLayer()) {
-        ClipRectsContext tempContext(context);
-        tempContext.cacheSlot = UncachedClipRects;
-        parentClipRects(tempContext, parentRects);
-    } else {
-        parentClipRects(context, parentRects);
-    }
+    parentClipRects(context, parentRects);
 
     ClipRect backgroundClipRect = backgroundClipRectForPosition(parentRects, m_renderer.style()->position());
-    RenderView* view = m_renderer.view();
-    ASSERT(view);
 
     // Note: infinite clipRects should not be scrolled here, otherwise they will accidentally no longer be considered infinite.
-    if (parentRects.fixed() && context.rootLayer->renderer() == view && backgroundClipRect != PaintInfo::infiniteRect())
-        backgroundClipRect.move(view->frameView()->scrollOffsetForFixedPosition());
+    if (parentRects.fixed() && context.rootLayer->renderer() == m_renderer.view() && backgroundClipRect != PaintInfo::infiniteRect())
+        backgroundClipRect.move(m_renderer.view()->frameView()->scrollOffsetForFixedPosition());
 
     return backgroundClipRect;
 }
 
 void RenderLayerClipper::parentClipRects(const ClipRectsContext& context, ClipRects& clipRects) const
 {
     // The root is not clipped.
     if (m_renderer.layer() == context.rootLayer) {
         clipRects.reset(PaintInfo::infiniteRect());
         return;
@@ skipping 28 matching lines @@
         ASSERT(current);
         if (current->transform() || current->isPaintInvalidationContainer())
             return const_cast<RenderLayer*>(current);
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 } // namespace WebCore