Remove PaintLayerPaintingOverflowContents.

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 198 matching lines @@
 
     LayoutPoint offset;
     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));
-            if (m_renderer.style()->hasBorderRadius())
-                foregroundRect.setHasRadius(true);
-        }
+        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.
             // FIXME: Does not do the right thing with CSS regions yet, since we don't yet factor in the
             // individual region boxes as overflow.
             LayoutRect layerBoundsWithVisualOverflow = toRenderBox(m_renderer).visualOverflowRect();
             layerBoundsWithVisualOverflow.moveBy(offset);
-            if (!isClippingRoot || context.respectOverflowClip == RespectOverflowClip)
-                backgroundRect.intersect(layerBoundsWithVisualOverflow);
+            backgroundRect.intersect(layerBoundsWithVisualOverflow);
         } else {
             LayoutRect bounds = toRenderBox(m_renderer).borderBoxRect();
             bounds.moveBy(offset);
-            if (!isClippingRoot || context.respectOverflowClip == RespectOverflowClip)
-                backgroundRect.intersect(bounds);
+            backgroundRect.intersect(bounds);
         }
     }
 
     // CSS clip (different than clipping due to overflow) can clip to any box, even if it falls outside of the border box.
     if (m_renderer.hasClip()) {
         // Clip applies to *us* as well, so go ahead and update the damageRect.
         LayoutRect newPosClip = toRenderBox(m_renderer).clipRect(offset);
         backgroundRect.intersect(newPosClip);
         foregroundRect.intersect(newPosClip);
         outlineRect.intersect(newPosClip);
@@ skipping 21 matching lines @@
             clipRects = *parentLayer->clipper().cachedClipRects(context);
         } else {
             parentLayer->clipper().calculateClipRects(context, clipRects);
         }
     } else {
         clipRects.reset(PaintInfo::infiniteRect());
     }
 
     adjustClipRectsForChildren(m_renderer, clipRects);
 
-    // FIXME: This logic looks wrong. We'll apply overflow clip rects even if we were told to IgnoreOverflowClip if m_renderer.hasClip().
-    if ((m_renderer.hasOverflowClip() && (context.respectOverflowClip == RespectOverflowClip || !isClippingRoot)) || m_renderer.hasClip()) {
+    if (m_renderer.hasOverflowClip()) {
         // This offset cannot use convertToLayerCoords, because sometimes our rootLayer may be across
         // some transformed layer boundary, for example, in the RenderLayerCompositor overlapMap, where
         // clipRects are needed in view space.
         applyClipRects(context, m_renderer, roundedLayoutPoint(m_renderer.localToContainerPoint(FloatPoint(), context.rootLayer->renderer())), clipRects);
     }
 }
 
 static ClipRect backgroundClipRectForPosition(const ClipRects& parentRects, EPosition position)
 {
     if (position == AbsolutePosition)
@@ skipping 34 matching lines @@
         ASSERT(current);
         if (current->transform())
             return const_cast<RenderLayer*>(current);
     }
 
     ASSERT_NOT_REACHED();
     return 0;
 }
 
 } // namespace blink