Merge outline paint phases into the foreground phase.

Merge outline paint phases into the foreground phase.

Mostly just mechanical changes. The one surprising bit
is that RenderLayer no longer needs to explictly paint
outlines. I tested manually that before this patch,
the paintOutline call in RenderLayer was needed for
outlines on positioned elements and that after this
patch it's not.

R=esprehn@chromium.org

Committed: https://chromium.googlesource.com/external/mojo/+/645a92066aa3f1fd8bc644b1942d70b48d57b2cd

[ojan, 2015-01-27 04:44:40]

ojan@chromium.org changed reviewers:
+ abarth@chromium.org, eseidel@chromium.org, esprehn@chromium.org

[ojan, 2015-01-27 04:44:40]

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

https://codereview.chromium.org/878023002/diff/1/sky/engine/core/rendering/Re...
sky/engine/core/rendering/RenderLayer.cpp:1051: paintOutline(context,
localPaintingInfo, paintingRootForRenderer, layerLocation, outlineRect);
Honestly, not really sure why we don't need this call anymore. But I tested that
before this patch we need it for outlines on positioned elements and after this
patch we don't.

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

https://codereview.chromium.org/878023002/diff/1/sky/engine/core/rendering/Re...
sky/engine/core/rendering/RenderReplaced.cpp:153: if (paintInfo.phase !=
PaintPhaseForeground && paintInfo.phase != PaintPhaseOutline && paintInfo.phase
!= PaintPhaseSelfOutline
This was listing every remaining phase except for one of the outline ones that
this patch removes.

[esprehn, 2015-01-28 01:22:26]

I guess without the outline phase all objects just paint an outline, so layers
are unrelated.

lgtm

https://codereview.chromium.org/878023002/diff/20001/sky/engine/core/renderin...
File sky/engine/core/rendering/RenderBlock.cpp (right):

https://codereview.chromium.org/878023002/diff/20001/sky/engine/core/renderin...
sky/engine/core/rendering/RenderBlock.cpp:630: if (style()->hasOutline() &&
!style()->outlineStyleIsAuto())
I wonder what outline: auto is for.

https://codereview.chromium.org/878023002/diff/20001/sky/engine/core/renderin...
File sky/engine/core/rendering/RenderReplaced.cpp (right):

https://codereview.chromium.org/878023002/diff/20001/sky/engine/core/renderin...
sky/engine/core/rendering/RenderReplaced.cpp:105: if (paintInfo.phase ==
PaintPhaseForeground && style()->outlineWidth())
not hasOutline() ? Straneg this code checks for hasOutline(), outlineStyle() !=
auto and here outlineWidth().

[ojan, 2015-01-28 01:26:09]

On 2015/01/28 at 01:22:26, esprehn wrote:
> I guess without the outline phase all objects just paint an outline, so layers
are unrelated.
> 
> lgtm
> 
>
https://codereview.chromium.org/878023002/diff/20001/sky/engine/core/renderin...
> File sky/engine/core/rendering/RenderBlock.cpp (right):
> 
>
https://codereview.chromium.org/878023002/diff/20001/sky/engine/core/renderin...
> sky/engine/core/rendering/RenderBlock.cpp:630: if (style()->hasOutline() &&
!style()->outlineStyleIsAuto())
> I wonder what outline: auto is for.

I think outline:auto is the default? It means that focus rects can use outline,
but then setting outline:0 will get rid of focus rects as well. We can get rid
of this concept since we won't have focus rects (at least, not built into the
platform).

>
https://codereview.chromium.org/878023002/diff/20001/sky/engine/core/renderin...
> File sky/engine/core/rendering/RenderReplaced.cpp (right):
> 
>
https://codereview.chromium.org/878023002/diff/20001/sky/engine/core/renderin...
> sky/engine/core/rendering/RenderReplaced.cpp:105: if (paintInfo.phase ==
PaintPhaseForeground && style()->outlineWidth())
> not hasOutline() ? Straneg this code checks for hasOutline(), outlineStyle()
!= auto and here outlineWidth().

Yup. I think we probably need to look at simplifying outlines at some point.
Seems unnecessarily complicated.

[ojan, 2015-01-28 01:45:09]

Committed patchset #2 (id:20001) manually as
645a92066aa3f1fd8bc644b1942d70b48d57b2cd (presubmit successful).