Merge outline paint phases into the foreground phase.

sky/engine/core/rendering/RenderBlock.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2007 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2010. 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
@@ skipping 533 matching lines @@
 
     // Our scrollbar widgets paint exactly when we tell them to, so that they work properly with
     // z-index.  We paint after we painted the background/border, so that the scrollbars will
     // sit above the background/border.
     if (hasOverflowClip() && phase == PaintPhaseForeground && paintInfo.shouldPaintWithinRoot(this))
         layer()->scrollableArea()->paintOverflowControls(paintInfo.context, roundedIntPoint(adjustedPaintOffset), paintInfo.rect, false /* paintingOverlayControls */);
 }
 
 void RenderBlock::paintContents(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    PaintPhase newPhase = (paintInfo.phase == PaintPhaseChildOutlines) ? PaintPhaseOutline : paintInfo.phase;
-
     // We don't paint our own background, but we do let the kids paint their backgrounds.
     PaintInfo paintInfoForChild(paintInfo);
-    paintInfoForChild.phase = newPhase;
     paintInfoForChild.updatePaintingRootForChildren(this);
     paintChildren(paintInfoForChild, paintOffset);
 }
 
 void RenderBlock::paintChildren(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     for (RenderBox* child = firstChildBox(); child; child = child->nextSiblingBox())
         paintChild(child, paintInfo, paintOffset);
 }
 
@@ skipping 18 matching lines @@
     // stacking context.  (See Appendix E.2, section 7.2.1.4 on
     // inline block/table/replaced elements in the CSS2.1 specification.)
     // This is also used by other elements (e.g. flex items).
     PaintInfo info(paintInfo);
 
     if (paintInfo.phase == PaintPhaseSelection) {
         renderer->paint(info, childPoint);
     } else {
         info.phase = PaintPhaseForeground;
         renderer->paint(info, childPoint);
-        info.phase = PaintPhaseOutline;
-        renderer->paint(info, childPoint);
     }
 }
 
 static inline bool hasCursorCaret(const FrameSelection& selection, const RenderBlock* block)
 {
     return selection.caretRenderer() == block && selection.hasEditableStyle();
 }
 
 static inline bool hasDragCaret(const DragCaretController& dragCaretController, const RenderBlock* block)
 {
@@ skipping 30 matching lines @@
     if (paintPhase == PaintPhaseForeground) {
         if (hasBoxDecorationBackground())
             paintBoxDecorationBackground(paintInfo, paintOffset);
     }
 
     if (paintPhase == PaintPhaseMask) {
         paintMask(paintInfo, paintOffset);
         return;
     }
 
-    if (paintPhase != PaintPhaseSelfOutline)
-        paintContents(paintInfo, scrolledOffset);
-
+    paintContents(paintInfo, scrolledOffset);
     paintSelection(paintInfo, scrolledOffset); // Fill in gaps in selection on lines and between blocks.
 
-    if ((paintPhase == PaintPhaseOutline || paintPhase == PaintPhaseSelfOutline)
-        && style()->hasOutline() && !style()->outlineStyleIsAuto()) {
-        paintOutline(paintInfo, LayoutRect(paintOffset, size()));
+    if (paintPhase == PaintPhaseForeground) {
+        if (style()->hasOutline() && !style()->outlineStyleIsAuto())
+            paintOutline(paintInfo, LayoutRect(paintOffset, size()));
+
+        // If the caret's node's render object's containing block is this block, and the paint action is PaintPhaseForeground,
+        // then paint the caret.
+        paintCarets(paintInfo, paintOffset);
     }
-
-    // If the caret's node's render object's containing block is this block, and the paint action is PaintPhaseForeground,
-    // then paint the caret.
-    if (paintPhase == PaintPhaseForeground)
-        paintCarets(paintInfo, paintOffset);
 }
 
 bool RenderBlock::shouldPaintSelectionGaps() const
 {
     return selectionState() != SelectionNone && isSelectionRoot();
 }
 
 bool RenderBlock::isSelectionRoot() const
 {
     ASSERT(node() || isAnonymous());
@@ skipping 1258 matching lines @@
 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* markedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const RenderObject* obj) const
 {
     showRenderObject();
     for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRootBox())
         root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLabel2, obj, 1);
 }
 
 #endif
 
 } // namespace blink