Merge the background paint phase into the foreground phase.

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 1025 matching lines @@
     // 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) {
-        paintBackground(context, transparencyLayerContext, paintingInfo.paintDirtyRect, haveTransparency,
-            localPaintingInfo, paintingRootForRenderer, layerLocation, backgroundRect);
-    }
-
     paintChildren(NegativeZOrderChildren, context, paintingInfo, paintFlags);
 
     if (shouldPaintContent) {
         paintForeground(context, transparencyLayerContext, paintingInfo.paintDirtyRect, haveTransparency,
             localPaintingInfo, paintingRootForRenderer, layerLocation, foregroundRect);
     }
 
     paintOutline(context, localPaintingInfo, paintingRootForRenderer, layerLocation, outlineRect);
     paintChildren(NormalFlowChildren | PositiveZOrderChildren, context, paintingInfo, paintFlags);
 
@@ skipping 52 matching lines @@
 #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::paintBackground(GraphicsContext* context, GraphicsContext* transparencyLayerContext,
-    const LayoutRect& transparencyPaintDirtyRect, bool haveTransparency, const LayerPaintingInfo& localPaintingInfo,
-    RenderObject* paintingRootForRenderer, LayoutPoint& layerLocation, ClipRect& layerBackgroundRect)
-{
-    // Begin transparency layers lazily now that we know we have to paint something.
-    if (haveTransparency)
-        beginTransparencyLayers(transparencyLayerContext, localPaintingInfo.rootLayer, transparencyPaintDirtyRect, localPaintingInfo.subPixelAccumulation);
-
-    if (localPaintingInfo.clipToDirtyRect) {
-        // Paint our background first, before painting any child layers.
-        // Establish the clip used to paint our background.
-        clipToRect(localPaintingInfo, context, layerBackgroundRect, DoNotIncludeSelfForBorderRadius); // Background painting will handle clipping to self.
-    }
-
-    // Paint the background.
-    // FIXME: Eventually we will collect the region from the fragment itself instead of just from the paint info.
-    PaintInfo paintInfo(context, pixelSnappedIntRect(layerBackgroundRect.rect()), PaintPhaseBlockBackground, paintingRootForRenderer, 0, localPaintingInfo.rootLayer->renderer());
-    renderer()->paint(paintInfo, layerLocation);
-
-    if (localPaintingInfo.clipToDirtyRect)
-        restoreClip(context, localPaintingInfo.paintDirtyRect, layerBackgroundRect);
-}
-
 void RenderLayer::paintForeground(GraphicsContext* context, GraphicsContext* transparencyLayerContext,
     const LayoutRect& transparencyPaintDirtyRect, bool haveTransparency, const LayerPaintingInfo& localPaintingInfo,
     RenderObject* paintingRootForRenderer, 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(PaintPhaseChildBlockBackgrounds,
-            context, localPaintingInfo, paintingRootForRenderer,
-            layerLocation, layerForegroundRect);
         paintForegroundWithPhase(PaintPhaseForeground,
             context, localPaintingInfo, paintingRootForRenderer,
             layerLocation, layerForegroundRect);
         paintForegroundWithPhase(PaintPhaseChildOutlines,
             context, localPaintingInfo, paintingRootForRenderer,
             layerLocation, layerForegroundRect);
     }
 
     if (shouldClip)
         restoreClip(context, localPaintingInfo.paintDirtyRect, layerForegroundRect);
@@ skipping 711 matching lines @@
     }
 }
 
 void showLayerTree(const blink::RenderObject* renderer)
 {
     if (!renderer)
         return;
     showLayerTree(renderer->enclosingLayer());
 }
 #endif