Merge outline paint phases into the foreground phase.

sky/engine/core/rendering/RenderBox.cpp

Index: sky/engine/core/rendering/RenderBox.cpp
diff --git a/sky/engine/core/rendering/RenderBox.cpp b/sky/engine/core/rendering/RenderBox.cpp
index 497b90e3556244878d0e9db933e3f34118617e1a..400c9b1de0000e03071a851b26bb5ef4a33a29b4 100644
--- a/sky/engine/core/rendering/RenderBox.cpp
+++ b/sky/engine/core/rendering/RenderBox.cpp
@@ -795,7 +795,7 @@ void RenderBox::paintFillLayer(const PaintInfo& paintInfo, const Color& c, const
 
 bool RenderBox::pushContentsClip(PaintInfo& paintInfo, const LayoutPoint& accumulatedOffset, ContentsClipBehavior contentsClipBehavior)
 {
-    if (paintInfo.phase == PaintPhaseSelfOutline || paintInfo.phase == PaintPhaseMask)
+    if (paintInfo.phase == PaintPhaseMask)
         return false;
 
     bool isControlClip = hasControlClip();
@@ -825,8 +825,6 @@ bool RenderBox::pushContentsClip(PaintInfo& paintInfo, const LayoutPoint& accumu
             return false;
     }
 
-    if (paintInfo.phase == PaintPhaseOutline)
-        paintInfo.phase = PaintPhaseChildOutlines;
     paintInfo.context->save();
     if (hasBorderRadius)
         paintInfo.context->clipRoundedRect(clipRoundedRect);
@@ -837,13 +835,7 @@ bool RenderBox::pushContentsClip(PaintInfo& paintInfo, const LayoutPoint& accumu
 void RenderBox::popContentsClip(PaintInfo& paintInfo, PaintPhase originalPhase, const LayoutPoint& accumulatedOffset)
 {
     ASSERT(hasControlClip() || (hasOverflowClip() && !layer()->isSelfPaintingLayer()));
-
     paintInfo.context->restore();
-    if (originalPhase == PaintPhaseOutline) {
-        paintInfo.phase = PaintPhaseSelfOutline;
-        paintObject(paintInfo, accumulatedOffset);
-        paintInfo.phase = originalPhase;
-    }
 }
 
 LayoutRect RenderBox::overflowClipRect(const LayoutPoint& location)