Remove painting roots.

sky/engine/core/rendering/RenderLayer.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 727 matching lines @@
 }
 
 void RenderLayer::updateStackingNode()
 {
     if (requiresStackingNode())
         m_stackingNode = adoptPtr(new RenderLayerStackingNode(this));
     else
         m_stackingNode = nullptr;
 }
 
-void RenderLayer::paint(GraphicsContext* context, const LayoutRect& damageRect, RenderObject* paintingRoot)
+void RenderLayer::paint(GraphicsContext* context, const LayoutRect& damageRect)
 {
     TRACE_EVENT0("blink", "RenderLayer::paint");
-    LayerPaintingInfo paintingInfo(this, enclosingIntRect(damageRect), LayoutSize(), paintingRoot);
+    LayerPaintingInfo paintingInfo(this, enclosingIntRect(damageRect), LayoutSize());
     paintLayer(context, paintingInfo, PaintContent);
 }
 
 static bool inContainingBlockChain(RenderLayer* startLayer, RenderLayer* endLayer)
 {
     if (startLayer == endLayer)
         return true;
 
     RenderView* view = startLayer->renderer()->view();
     for (RenderBlock* currentBlock = startLayer->renderer()->containingBlock(); currentBlock && currentBlock != view; currentBlock = currentBlock->containingBlock()) {
@@ skipping 164 matching lines @@
             // FIXME: It is incorrect to just clip to the damageRect here once multiple fragments are involved.
             clipToRect(localPaintingInfo, context, backgroundRect);
             // Subsequent code should not clip to the dirty rect, since we've already
             // done it above, and doing it later will defeat the outsets.
             localPaintingInfo.clipToDirtyRect = false;
 
             context = filterPainter.beginFilterEffect(context);
         }
     }
 
-    // If this layer's renderer is a child of the paintingRoot, we render unconditionally, which
-    // is done by passing a nil paintingRoot down to our renderer (as if no paintingRoot was ever set).
-    // Else, our renderer tree may or may not contain the painting root, so we pass that root along
-    // so it will be tested against as we descend through the renderers.
-    RenderObject* paintingRootForRenderer = 0;
-    if (localPaintingInfo.paintingRoot && !renderer()->isDescendantOf(localPaintingInfo.paintingRoot))
-        paintingRootForRenderer = localPaintingInfo.paintingRoot;
-
     LayoutPoint layerLocation = toPoint(layerBounds.location() - renderBoxLocation() + localPaintingInfo.subPixelAccumulation);
 
     if (shouldPaintContent) {
         paintForeground(context, transparencyLayerContext, paintingInfo.paintDirtyRect, haveTransparency,
-            localPaintingInfo, paintingRootForRenderer, layerLocation, backgroundRect);
+            localPaintingInfo, layerLocation, backgroundRect);
     }
 
     paintChildren(NormalFlowChildren | PositiveZOrderChildren, context, paintingInfo, paintFlags);
 
     if (filterPainter.hasStartedFilterEffect()) {
         context = filterPainter.applyFilterEffect();
         restoreClip(transparencyLayerContext, localPaintingInfo.paintDirtyRect, backgroundRect);
     }
 
     // Make sure that we now use the original transparency context.
     ASSERT(transparencyLayerContext == context);
 
     if (shouldPaintContent && renderer()->hasMask())
-        paintMask(context, localPaintingInfo, paintingRootForRenderer, layerLocation, backgroundRect);
+        paintMask(context, localPaintingInfo, layerLocation, backgroundRect);
 
     // End our transparency layer
     if (haveTransparency && m_usedTransparency) {
         context->endLayer();
         context->restore();
         m_usedTransparency = false;
     }
 }
 
 void RenderLayer::paintLayerByApplyingTransform(GraphicsContext* context, const LayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags, const LayoutPoint& translationOffset)
@@ skipping 10 matching lines @@
 
     // Apply the transform.
     GraphicsContextStateSaver stateSaver(*context, false);
     if (!transform.isIdentity()) {
         stateSaver.save();
         context->concatCTM(transform.toAffineTransform());
     }
 
     // Now do a paint with the root layer shifted to be us.
     LayerPaintingInfo transformedPaintingInfo(this, enclosingIntRect(transform.inverse().mapRect(paintingInfo.paintDirtyRect)),
-        adjustedSubPixelAccumulation, paintingInfo.paintingRoot);
+        adjustedSubPixelAccumulation);
     paintLayerContents(context, transformedPaintingInfo, paintFlags);
 }
 
 void RenderLayer::paintChildren(unsigned childrenToVisit, GraphicsContext* context, const LayerPaintingInfo& paintingInfo, PaintLayerFlags paintFlags)
 {
     if (!hasSelfPaintingLayerDescendant())
         return;
 
 #if ENABLE(ASSERT)
     LayerListMutationDetector mutationChecker(m_stackingNode.get());
 #endif
 
     RenderLayerStackingNodeIterator iterator(*m_stackingNode, childrenToVisit);
     while (RenderLayerStackingNode* child = iterator.next()) {
         child->layer()->paintLayer(context, paintingInfo, paintFlags);
     }
 }
 
 void RenderLayer::paintForeground(GraphicsContext* context, GraphicsContext* transparencyLayerContext,
     const LayoutRect& transparencyPaintDirtyRect, bool haveTransparency, const LayerPaintingInfo& localPaintingInfo,
-    RenderObject* paintingRootForRenderer, LayoutPoint& layerLocation, ClipRect& layerForegroundRect)
+    LayoutPoint& layerLocation, ClipRect& layerForegroundRect)
 {
     bool foregroundRectIsEmpty = layerForegroundRect.isEmpty();
 
     // Begin transparency if we have something to paint.
     if (haveTransparency && !foregroundRectIsEmpty)
         beginTransparencyLayers(transparencyLayerContext, localPaintingInfo.rootLayer, transparencyPaintDirtyRect, localPaintingInfo.subPixelAccumulation);
 
     // Optimize clipping for the single fragment case.
     bool shouldClip = localPaintingInfo.clipToDirtyRect && !foregroundRectIsEmpty;
     if (shouldClip)
         clipToRect(localPaintingInfo, context, layerForegroundRect);
 
     if (!foregroundRectIsEmpty) {
         // We have to loop through every fragment multiple times, since we have to issue paint invalidations in each specific phase in order for
         // interleaving of the fragments to work properly.
         // FIXME(sky): Do we still need this for anything now that we don't have fragments?
         paintForegroundWithPhase(PaintPhaseForeground,
-            context, localPaintingInfo, paintingRootForRenderer,
+            context, localPaintingInfo,
             layerLocation, layerForegroundRect);
     }
 
     if (shouldClip)
         restoreClip(context, localPaintingInfo.paintDirtyRect, layerForegroundRect);
 }
 
 void RenderLayer::paintForegroundWithPhase(PaintPhase phase, GraphicsContext* context,
-    const LayerPaintingInfo& localPaintingInfo, RenderObject* paintingRootForRenderer, LayoutPoint& layerLocation, ClipRect& layerForegroundRect)
+    const LayerPaintingInfo& localPaintingInfo, LayoutPoint& layerLocation, ClipRect& layerForegroundRect)
 {
-    PaintInfo paintInfo(context, pixelSnappedIntRect(layerForegroundRect.rect()), phase, paintingRootForRenderer, localPaintingInfo.rootLayer->renderer());
+    PaintInfo paintInfo(context, pixelSnappedIntRect(layerForegroundRect.rect()), phase, localPaintingInfo.rootLayer->renderer());
     renderer()->paint(paintInfo, layerLocation);
 }
 
 void RenderLayer::paintMask(GraphicsContext* context, const LayerPaintingInfo& localPaintingInfo,
-    RenderObject* paintingRootForRenderer, LayoutPoint& layerLocation, ClipRect& layerBackgroundRect)
+    LayoutPoint& layerLocation, ClipRect& layerBackgroundRect)
 {
     if (localPaintingInfo.clipToDirtyRect)
         clipToRect(localPaintingInfo, context, layerBackgroundRect, DoNotIncludeSelfForBorderRadius); // Mask painting will handle clipping to self.
 
     // Paint the mask.
     // FIXME: Eventually we will collect the region from the fragment itself instead of just from the paint info.
-    PaintInfo paintInfo(context, pixelSnappedIntRect(layerBackgroundRect.rect()), PaintPhaseMask, paintingRootForRenderer, localPaintingInfo.rootLayer->renderer());
+    PaintInfo paintInfo(context, pixelSnappedIntRect(layerBackgroundRect.rect()), PaintPhaseMask, localPaintingInfo.rootLayer->renderer());
     renderer()->paint(paintInfo, layerLocation);
 
     if (localPaintingInfo.clipToDirtyRect)
         restoreClip(context, localPaintingInfo.paintDirtyRect, layerBackgroundRect);
 }
 
 static inline LayoutRect frameVisibleRect(RenderObject* renderer)
 {
     FrameView* frameView = renderer->document().view();
     if (!frameView)
@@ skipping 641 matching lines @@
     }
 }
 
 void showLayerTree(const blink::RenderObject* renderer)
 {
     if (!renderer)
         return;
     showLayerTree(renderer->enclosingLayer());
 }
 #endif