Merge outline paint phases into the foreground phase.

sky/engine/core/rendering/RenderReplaced.cpp

Index: sky/engine/core/rendering/RenderReplaced.cpp
diff --git a/sky/engine/core/rendering/RenderReplaced.cpp b/sky/engine/core/rendering/RenderReplaced.cpp
index fe60501cbf915737a5db96bc2aaa736321ef2b2b..b89dd1ea482417fccf5e9da6b7317ffa579644a6 100644
--- a/sky/engine/core/rendering/RenderReplaced.cpp
+++ b/sky/engine/core/rendering/RenderReplaced.cpp
@@ -102,7 +102,7 @@ void RenderReplaced::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
     }
 
     LayoutRect paintRect = LayoutRect(adjustedPaintOffset, size());
-    if ((paintInfo.phase == PaintPhaseOutline || paintInfo.phase == PaintPhaseSelfOutline) && style()->outlineWidth())
+    if (paintInfo.phase == PaintPhaseForeground && style()->outlineWidth())
         paintOutline(paintInfo, paintRect);
 
     if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseSelection && !canHaveChildren())
@@ -150,10 +150,6 @@ void RenderReplaced::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 
 bool RenderReplaced::shouldPaint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    if (paintInfo.phase != PaintPhaseForeground && paintInfo.phase != PaintPhaseOutline && paintInfo.phase != PaintPhaseSelfOutline

[ojan, 2015/01/27 04:44:40]

This was listing every remaining phase except for one of the outline ones that
this patch removes.

-        && paintInfo.phase != PaintPhaseSelection && paintInfo.phase != PaintPhaseMask)
-        return false;
-
     if (!paintInfo.shouldPaintWithinRoot(this))
         return false;