From 5dd395d81d49474b4eca012b1ff04f6b3d68ac73 Mon Sep 17 00:00:00 2001 From: Ojan Vafai Date: Tue, 27 Jan 2015 17:45:04 -0800 Subject: [PATCH] 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 Review URL: https://codereview.chromium.org/878023002 --- engine/src/flutter/tests/layout/ellipsis-expected.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/engine/src/flutter/tests/layout/ellipsis-expected.txt b/engine/src/flutter/tests/layout/ellipsis-expected.txt index 1509ce8d2ec..05d448345c2 100644 --- a/engine/src/flutter/tests/layout/ellipsis-expected.txt +++ b/engine/src/flutter/tests/layout/ellipsis-expected.txt @@ -10,7 +10,7 @@ layer at (0,0) size 56x69 clip at (3,3) size 50x63 RenderParagraph (anonymous) at (3,47) size 50x19 RenderText {#text} at (0,0) size 94x19 text run at (0,0) width 94: "all ellipsize." -layer at (3,22) size 56x25 backgroundClip at (3,22) size 50x25 clip at (6,25) size 47x19 outlineClip at (3,3) size 50x63 +layer at (3,22) size 56x25 backgroundClip at (3,22) size 50x25 clip at (6,25) size 47x19 RenderParagraph {p} at (3,22) size 56x25 [border: (3px solid #FF0000)] RenderText {#text} at (3,3) size 54x19 text run at (3,3) width 54: "should"