Removed a bunch of unneeded paint phase checks.

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 452 matching lines @@
             return;
     }
 
     // There are some cases where not all clipped visual overflow is accounted for.
     // FIXME: reduce the number of such cases.
     ContentsClipBehavior contentsClipBehavior = ForceContentsClip;
     if (hasOverflowClip() && !(shouldPaintSelectionGaps() && phase == PaintPhaseForeground) && !hasCaret())
         contentsClipBehavior = SkipContentsClipIfPossible;
 
     bool pushedClip = pushContentsClip(paintInfo, adjustedPaintOffset, contentsClipBehavior);
-    {
-        paintObject(paintInfo, adjustedPaintOffset);
-    }
+    paintObject(paintInfo, adjustedPaintOffset);
     if (pushedClip)
         popContentsClip(paintInfo, phase, adjustedPaintOffset);
 }
 
 void RenderBlock::paintContents(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
     // FIXME(sky): Can we remove paintContents and just keep paintChildren?
     paintChildren(paintInfo, paintOffset);
 }
 
@@ skipping 47 matching lines @@
     }
 
     DragCaretController& dragCaretController = frame()->page()->dragCaretController();
     if (hasDragCaret(dragCaretController, this)) {
         dragCaretController.paintDragCaret(frame(), paintInfo.context, paintOffset, paintInfo.rect);
     }
 }
 
 void RenderBlock::paintObject(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    PaintPhase paintPhase = paintInfo.phase;
-
-    if (paintPhase == PaintPhaseForeground) {
-        if (hasBoxDecorationBackground())
-            paintBoxDecorationBackground(paintInfo, paintOffset);
-    }
-
-    if (paintPhase == PaintPhaseMask) {
+    if (paintInfo.phase == PaintPhaseMask) {
         paintMask(paintInfo, paintOffset);
         return;
     }
 
+    if (hasBoxDecorationBackground())
+        paintBoxDecorationBackground(paintInfo, paintOffset);
+
     paintContents(paintInfo, paintOffset);
     paintSelection(paintInfo, paintOffset); // Fill in gaps in selection on lines and between blocks.
 
-    if (paintPhase == PaintPhaseForeground) {
-        if (style()->hasOutline() && !style()->outlineStyleIsAuto())
-            paintOutline(paintInfo, LayoutRect(paintOffset, size()));
+    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);
-    }
+    paintCarets(paintInfo, paintOffset);
 }
 
 bool RenderBlock::shouldPaintSelectionGaps() const
 {
     return selectionState() != SelectionNone && isSelectionRoot();
 }
 
 bool RenderBlock::isSelectionRoot() const
 {
     ASSERT(node() || isAnonymous());
 
     if (isDocumentElement() || hasOverflowClip()
         || isPositioned()
         || isInlineBlock()
         || hasTransform() || hasMask()
         || isFlexItem())
         return true;
 
     if (view() && view()->selectionStart()) {
         Node* startElement = view()->selectionStart()->node();
         if (startElement && startElement->rootEditableElement() == node())
             return true;
     }
 
     return false;
 }
 
 void RenderBlock::paintSelection(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
 {
-    if (shouldPaintSelectionGaps() && paintInfo.phase == PaintPhaseForeground) {
+    if (shouldPaintSelectionGaps()) {

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

The caller already does this check.

         LayoutUnit lastTop = 0;
         LayoutUnit lastLeft = logicalLeftSelectionOffset(this, lastTop);
         LayoutUnit lastRight = logicalRightSelectionOffset(this, lastTop);
         GraphicsContextStateSaver stateSaver(*paintInfo.context);
 
         // TODO(ojan): In sky, we don't use the return value, but we
         // need this in order to actually paint selection gaps.
         // We should rename it appropriately.
         selectionGaps(this, paintOffset, LayoutSize(), lastTop, lastLeft, lastRight, &paintInfo);
     }
@@ skipping 1204 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