Merge outline paint phases into the foreground phase.

sky/engine/core/rendering/InlineTextBox.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
  *
@@ skipping 463 matching lines @@
             context->setFillColor(textStyle.emphasisMarkColor);
         paintEmphasisMark(context, emphasisMark, emphasisMarkOffset, startOffset, endOffset, length, font, textRun, textOrigin, boxRect);
     }
 }
 
 } // namespace
 
 void InlineTextBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit /*lineTop*/, LayoutUnit /*lineBottom*/)
 {
     if (isLineBreak() || !paintInfo.shouldPaintWithinRoot(&renderer())
-        || m_truncation == cFullTruncation || paintInfo.phase == PaintPhaseOutline || !m_len)
+        || m_truncation == cFullTruncation || !m_len)
         return;
 
-    ASSERT(paintInfo.phase != PaintPhaseSelfOutline && paintInfo.phase != PaintPhaseChildOutlines);
-
     LayoutRect logicalVisualOverflow = logicalOverflowRect();
     LayoutUnit logicalStart = logicalVisualOverflow.x() + paintOffset.x();
     LayoutUnit logicalExtent = logicalVisualOverflow.width();
 
     LayoutUnit paintEnd = paintInfo.rect.maxX();
     LayoutUnit paintStart = paintInfo.rect.x();
 
     // When subpixel font scaling is enabled text runs are positioned at
     // subpixel boundaries on the x-axis and thus there is no reason to
     // snap the x value. We still round the y-axis to ensure consistent
@@ skipping 850 matching lines @@
     printedCharacters = fprintf(stderr, "\t%s %p", obj.renderName(), &obj);
     const int rendererCharacterOffset = 24;
     for (; printedCharacters < rendererCharacterOffset; printedCharacters++)
         fputc(' ', stderr);
     fprintf(stderr, "(%d,%d) \"%s\"\n", start(), start() + len(), value.utf8().data());
 }
 
 #endif
 
 } // namespace blink