Removed a bunch of unneeded paint phase checks.

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 984 matching lines @@
     overflowRect.moveBy(paintOffset);
 
     if (!paintInfo.rect.intersects(pixelSnappedIntRect(overflowRect)))
         return;
 
     if (paintInfo.phase == PaintPhaseMask) {
         paintMask(paintInfo, paintOffset);
         return;
     }
 
-    if (paintInfo.phase == PaintPhaseForeground)
-        paintBoxDecorationBackground(paintInfo, paintOffset);
+    paintBoxDecorationBackground(paintInfo, paintOffset);
 
     for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {
         if (curr->renderer().isText() || !curr->boxModelObject()->hasSelfPaintingLayer())
             curr->paint(paintInfo, paintOffset, lineTop, lineBottom);
     }
 }
 
 void InlineFlowBox::paintFillLayers(const PaintInfo& paintInfo, const Color& c, const FillLayer& fillLayer, const LayoutRect& rect)
 {
     if (fillLayer.next())
@@ skipping 75 matching lines @@
         clipRect.setX(paintRect.x() - outsets.left());
         clipRect.setWidth(paintRect.width() + outsets.left());
     }
     if (box->includeLogicalRightEdge())
         clipRect.setWidth(clipRect.width() + outsets.right());
     return clipRect;
 }
 
 void InlineFlowBox::paintBoxDecorationBackground(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    ASSERT(paintInfo.phase == PaintPhaseForeground);
-
     // You can use p::first-line to specify a background. If so, the root line boxes for
     // a line may actually have to paint a background.
     RenderStyle* styleToUse = renderer().style(isFirstLineStyle());
     bool shouldPaintBoxDecorationBackground;
     if (parent())
         shouldPaintBoxDecorationBackground = renderer().hasBoxDecorationBackground();
     else
         shouldPaintBoxDecorationBackground = isFirstLineStyle() && styleToUse != renderer().style();
 
     if (!shouldPaintBoxDecorationBackground)
@@ skipping 52 matching lines @@
             LayoutRect clipRect = clipRectForNinePieceImageStrip(this, borderImage, paintRect);
             GraphicsContextStateSaver stateSaver(*paintInfo.context);
             paintInfo.context->clip(clipRect);
             boxModelObject()->paintBorder(paintInfo, LayoutRect(stripX, stripY, stripWidth, stripHeight), renderer().style(isFirstLineStyle()));
         }
     }
 }
 
 void InlineFlowBox::paintMask(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    if (paintInfo.phase != PaintPhaseMask)

[ojan, 2015/01/30 01:25:59]

The caller already does this check.

[abarth-chromium, 2015/01/30 02:37:56]

ASSERT?

[ojan, 2015/01/30 02:54:49]

I'll be removing the paint phase entirely in my next patch or two, so it's
easier to just remove as many uses as possible.

-        return;
-
     // Pixel snap mask painting.
     LayoutRect frameRect = roundedFrameRect();
 
     // Move x/y to our coordinates.
     LayoutRect localRect(frameRect);
     LayoutPoint adjustedPaintOffset = paintOffset + localRect.location();
 
     const NinePieceImage& maskNinePieceImage = renderer().style()->maskBoxImage();
     StyleImage* maskBoxImage = renderer().style()->maskBoxImage().image();
 
@@ skipping 219 matching lines @@
         ASSERT(child->prevOnLine() == prev);
         prev = child;
     }
     ASSERT(prev == m_lastChild);
 #endif
 }
 
 #endif
 
 } // namespace blink