Removed a bunch of unneeded paint phase checks.

Removed a bunch of unneeded paint phase checks.

We only have two paint phases now, so we don't
need to do as many checks. Also, remove some
early returns that are not possible to hit since
the earlier code checks that phase already.

R=abarth@chromium.org, esprehn@chromium.org

Committed: https://chromium.googlesource.com/external/mojo/+/da24e949d91ebea9302a4b1f96558b99c35a74eb

[ojan, 2015-01-30 01:25:58]

ojan@chromium.org changed reviewers:
+ esprehn@chromium.org

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

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/In...
File sky/engine/core/rendering/InlineFlowBox.cpp (left):

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/In...
sky/engine/core/rendering/InlineFlowBox.cpp:1176: if (paintInfo.phase !=
PaintPhaseMask)
The caller already does this check.

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/In...
File sky/engine/core/rendering/InlineTextBox.cpp (right):

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/In...
sky/engine/core/rendering/InlineTextBox.cpp:620: paintDocumentMarkers(context,
boxOrigin, styleToUse, font, false);
Not sure why we'd want to skip this code if we're painting masks.

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/Re...
File sky/engine/core/rendering/RenderBlock.cpp (right):

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/Re...
sky/engine/core/rendering/RenderBlock.cpp:585: if (shouldPaintSelectionGaps()) {
The caller already does this check.

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/Re...
File sky/engine/core/rendering/RenderBox.cpp (left):

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/Re...
sky/engine/core/rendering/RenderBox.cpp:504: if (paintInfo.phase !=
PaintPhaseMask)
The caller already does this check.

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/Re...
File sky/engine/core/rendering/RenderReplaced.cpp (left):

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/Re...
sky/engine/core/rendering/RenderReplaced.cpp:108: if (paintInfo.phase ==
PaintPhaseMask && !canHaveChildren())
We've already early returned above if we're painting masks.

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

abarth@chromium.org changed reviewers:
+ abarth@chromium.org

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

lgtm

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/In...
File sky/engine/core/rendering/InlineFlowBox.cpp (left):

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/In...
sky/engine/core/rendering/InlineFlowBox.cpp:1176: if (paintInfo.phase !=
PaintPhaseMask)
On 2015/01/30 at 01:25:59, ojan wrote:
> The caller already does this check.

ASSERT?

[esprehn, 2015-01-30 02:53:18]

lgtm

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

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/In...
File sky/engine/core/rendering/InlineFlowBox.cpp (left):

https://codereview.chromium.org/891573002/diff/1/sky/engine/core/rendering/In...
sky/engine/core/rendering/InlineFlowBox.cpp:1176: if (paintInfo.phase !=
PaintPhaseMask)
On 2015/01/30 02:37:56, abarth wrote:
> On 2015/01/30 at 01:25:59, ojan wrote:
> > The caller already does this check.
> 
> ASSERT?

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.

[ojan, 2015-01-30 02:57:11]

Committed patchset #1 (id:1) manually as
da24e949d91ebea9302a4b1f96558b99c35a74eb (presubmit successful).