Merge outline paint phases into the foreground phase.

sky/engine/core/rendering/InlineFlowBox.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 982 matching lines @@
 {
     LayoutRect overflowRect(visualOverflowRect(lineTop, lineBottom));
     overflowRect.moveBy(paintOffset);
 
     if (!paintInfo.rect.intersects(pixelSnappedIntRect(overflowRect)))
         return;
 
     if (paintInfo.phase == PaintPhaseMask) {
         paintMask(paintInfo, paintOffset);
         return;
-    } else if (paintInfo.phase == PaintPhaseForeground) {
-        // Paint our background, border and box-shadow.
-        paintBoxDecorationBackground(paintInfo, paintOffset);
     }
 
-    // Paint our children.
-    if (paintInfo.phase != PaintPhaseSelfOutline) {
-        PaintInfo childInfo(paintInfo);
-        childInfo.phase = paintInfo.phase == PaintPhaseChildOutlines ? PaintPhaseOutline : paintInfo.phase;
+    if (paintInfo.phase == PaintPhaseForeground)
+        paintBoxDecorationBackground(paintInfo, paintOffset);
 
-        if (childInfo.paintingRoot && childInfo.paintingRoot->isDescendantOf(&renderer()))
-            childInfo.paintingRoot = 0;
-        else
-            childInfo.updatePaintingRootForChildren(&renderer());
+    PaintInfo childInfo(paintInfo);
 
-        for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
-            if (curr->renderer().isText() || !curr->boxModelObject()->hasSelfPaintingLayer())
-                curr->paint(childInfo, paintOffset, lineTop, lineBottom);
-        }
+    if (childInfo.paintingRoot && childInfo.paintingRoot->isDescendantOf(&renderer()))
+        childInfo.paintingRoot = 0;
+    else
+        childInfo.updatePaintingRootForChildren(&renderer());
+
+    for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
+        if (curr->renderer().isText() || !curr->boxModelObject()->hasSelfPaintingLayer())
+            curr->paint(childInfo, paintOffset, lineTop, lineBottom);
     }
 }
 
 void InlineFlowBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, const FillLayer& fillLayer, const LayoutRect& rect)
 {
     if (fillLayer.next())
         paintFillLayers(paintInfo, c, *fillLayer.next(), rect);
     paintFillLayer(paintInfo, c, fillLayer, rect);
 }
 
@@ skipping 389 matching lines @@
         ASSERT(child->prevOnLine() == prev);
         prev = child;
     }
     ASSERT(prev == m_lastChild);
 #endif
 }
 
 #endif
 
 } // namespace blink