[LayoutNG] flag-specific rebaselines for css2.1
For the following 2 tests, their test blocks render
correctly, but fail because its LayoutNG uses different
font for spaces in the ref block. LayoutNG segments whole
paragraph, and that fonts for the space characters may be
affected by surrounding characters.
css2.1/t1202-counter-04-b.html
css2.1/t1202-counters-04-b.html
TBR=eae@chromium.org
NOTRY=true
Bug: 591099
Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng
Change-Id: I8f2bdc838bf00355cbed18786080f727c41eea66
Reviewed-on: https://chromium-review.googlesource.com/1142046
Commit-Queue: Koji Ishii <kojii@chromium.org>
Reviewed-by: Koji Ishii <kojii@chromium.org>
Cr-Commit-Position: refs/heads/master@{#576080}diff --git a/third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG b/third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG
index 626ee76..da2b5b1a 100644
--- a/third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG
+++ b/third_party/WebKit/LayoutTests/FlagExpectations/enable-blink-features=LayoutNG
@@ -72,8 +72,6 @@
crbug.com/591099 compositing/squashing/squash-same-transform-ancestor.html [ Failure ]
crbug.com/591099 compositing/squashing/squashing-inside-perspective.html [ Failure ]
crbug.com/591099 css1/box_properties/float_on_text_elements.html [ Failure ]
-crbug.com/591099 css2.1/t1202-counter-04-b.html [ Failure ]
-crbug.com/591099 css2.1/t1202-counters-04-b.html [ Failure ]
crbug.com/591099 css3/blending/mix-blend-mode-composited-reason-children.html [ Failure ]
crbug.com/591099 css3/blending/mix-blend-mode-isolation-2-stacking-contexts.html [ Failure ]
crbug.com/591099 css3/filters/composited-layer-child-bounds-after-composited-to-sw-shadow-change.html [ Failure ]
diff --git a/third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/css2.1/t1202-counter-04-b-expected.png b/third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/css2.1/t1202-counter-04-b-expected.png
new file mode 100644
index 0000000..2fddef0
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/css2.1/t1202-counter-04-b-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/css2.1/t1202-counter-04-b-expected.txt b/third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/css2.1/t1202-counter-04-b-expected.txt
new file mode 100644
index 0000000..9bfed86
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/css2.1/t1202-counter-04-b-expected.txt
@@ -0,0 +1,88 @@
+layer at (0,0) size 800x600
+ LayoutView at (0,0) size 800x600
+layer at (0,0) size 800x100
+ LayoutNGBlockFlow {HTML} at (0,0) size 800x100
+ LayoutNGBlockFlow {BODY} at (8,16) size 784x76
+ LayoutNGBlockFlow {P} at (0,0) size 784x20
+ LayoutText {#text} at (0,0) size 233x19
+ text run at (0,0) width 233: "The following two lines should look "
+ LayoutInline {EM} at (0,0) size 90x19
+ LayoutText {#text} at (233,0) size 90x19
+ text run at (233,0) width 90: "approximately"
+ LayoutText {#text} at (323,0) size 63x19
+ text run at (323,0) width 63: " the same:"
+ LayoutNGBlockFlow {DIV} at (0,36) size 784x20
+ LayoutInline {SPAN} at (0,0) size 10x19
+ LayoutInline {<pseudo:before>} at (0,0) size 10x19
+ LayoutCounter (anonymous) at (0,0) size 10x19
+ text run at (0,0) width 10: "\x{25A0}"
+ LayoutText {#text} at (10,0) size 4x19
+ text run at (10,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 10x19
+ LayoutInline {<pseudo:before>} at (0,0) size 10x19
+ LayoutCounter (anonymous) at (14,0) size 10x19
+ text run at (14,0) width 10: "\x{25A0}"
+ LayoutText {#text} at (24,0) size 4x19
+ text run at (24,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 10x19
+ LayoutInline {<pseudo:before>} at (0,0) size 10x19
+ LayoutCounter (anonymous) at (28,0) size 10x19
+ text run at (28,0) width 10: "\x{25A0}"
+ LayoutText {#text} at (38,0) size 4x19
+ text run at (38,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 10x19
+ LayoutInline {<pseudo:before>} at (0,0) size 10x19
+ LayoutCounter (anonymous) at (42,0) size 10x19
+ text run at (42,0) width 10: "\x{25A0}"
+ LayoutText {#text} at (52,0) size 4x19
+ text run at (52,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 10x19
+ LayoutInline {<pseudo:before>} at (0,0) size 10x19
+ LayoutCounter (anonymous) at (56,0) size 10x19
+ text run at (56,0) width 10: "\x{25A0}"
+ LayoutText {#text} at (66,0) size 4x19
+ text run at (66,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 10x19
+ LayoutInline {<pseudo:before>} at (0,0) size 10x19
+ LayoutCounter (anonymous) at (70,0) size 10x19
+ text run at (70,0) width 10: "\x{25A0}"
+ LayoutText {#text} at (80,0) size 4x19
+ text run at (80,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 10x19
+ LayoutInline {<pseudo:before>} at (0,0) size 10x19
+ LayoutCounter (anonymous) at (84,0) size 10x19
+ text run at (84,0) width 10: "\x{25A0}"
+ LayoutText {#text} at (94,0) size 4x19
+ text run at (94,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 10x19
+ LayoutInline {<pseudo:before>} at (0,0) size 10x19
+ LayoutCounter (anonymous) at (98,0) size 10x19
+ text run at (98,0) width 10: "\x{25A0}"
+ LayoutText {#text} at (108,0) size 4x19
+ text run at (108,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 10x19
+ LayoutInline {<pseudo:before>} at (0,0) size 10x19
+ LayoutCounter (anonymous) at (112,0) size 10x19
+ text run at (112,0) width 10: "\x{25A0}"
+ LayoutText {#text} at (122,0) size 4x19
+ text run at (122,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 10x19
+ LayoutInline {<pseudo:before>} at (0,0) size 10x19
+ LayoutCounter (anonymous) at (126,0) size 10x19
+ text run at (126,0) width 10: "\x{25A0}"
+ LayoutText {#text} at (136,0) size 4x19
+ text run at (136,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 10x19
+ LayoutInline {<pseudo:before>} at (0,0) size 10x19
+ LayoutCounter (anonymous) at (140,0) size 10x19
+ text run at (140,0) width 10: "\x{25A0}"
+ LayoutText {#text} at (150,0) size 4x19
+ text run at (150,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 10x19
+ LayoutInline {<pseudo:before>} at (0,0) size 10x19
+ LayoutCounter (anonymous) at (154,0) size 10x19
+ text run at (154,0) width 10: "\x{25A0}"
+ LayoutText {#text} at (0,0) size 0x0
+ LayoutNGBlockFlow {DIV} at (0,56) size 784x20
+ LayoutText {#text} at (0,0) size 144x19
+ text run at (0,0) width 144: "\x{25FE}\x{25FE}\x{25FE}\x{25FE}\x{25FE}\x{25FE}\x{25FE}\x{25FE}\x{25FE}\x{25FE}\x{25FE}\x{25FE}"
diff --git a/third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/css2.1/t1202-counters-04-b-expected.png b/third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/css2.1/t1202-counters-04-b-expected.png
new file mode 100644
index 0000000..e7ecc33e
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/css2.1/t1202-counters-04-b-expected.png
Binary files differ
diff --git a/third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/css2.1/t1202-counters-04-b-expected.txt b/third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/css2.1/t1202-counters-04-b-expected.txt
new file mode 100644
index 0000000..6e169f7
--- /dev/null
+++ b/third_party/WebKit/LayoutTests/flag-specific/enable-blink-features=LayoutNG/css2.1/t1202-counters-04-b-expected.txt
@@ -0,0 +1,112 @@
+layer at (0,0) size 800x600
+ LayoutView at (0,0) size 800x600
+layer at (0,0) size 800x100
+ LayoutNGBlockFlow {HTML} at (0,0) size 800x100
+ LayoutNGBlockFlow {BODY} at (8,16) size 784x76
+ LayoutNGBlockFlow {P} at (0,0) size 784x20
+ LayoutText {#text} at (0,0) size 233x19
+ text run at (0,0) width 233: "The following two lines should look "
+ LayoutInline {EM} at (0,0) size 90x19
+ LayoutText {#text} at (233,0) size 90x19
+ text run at (233,0) width 90: "approximately"
+ LayoutText {#text} at (323,0) size 63x19
+ text run at (323,0) width 63: " the same:"
+ LayoutNGBlockFlow {DIV} at (0,36) size 784x20
+ LayoutInline {SPAN} at (0,0) size 24x19
+ LayoutInline {<pseudo:before>} at (0,0) size 24x19
+ LayoutCounter (anonymous) at (0,0) size 24x19
+ text run at (0,0) width 24: "\x{25A0}.\x{25A0}"
+ LayoutText {#text} at (24,0) size 4x19
+ text run at (24,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 24x19
+ LayoutInline {<pseudo:before>} at (0,0) size 24x19
+ LayoutCounter (anonymous) at (28,0) size 24x19
+ text run at (28,0) width 24: "\x{25A0}.\x{25A0}"
+ LayoutText {#text} at (52,0) size 4x19
+ text run at (52,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 24x19
+ LayoutInline {<pseudo:before>} at (0,0) size 24x19
+ LayoutCounter (anonymous) at (56,0) size 24x19
+ text run at (56,0) width 24: "\x{25A0}.\x{25A0}"
+ LayoutText {#text} at (80,0) size 4x19
+ text run at (80,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 24x19
+ LayoutInline {<pseudo:before>} at (0,0) size 24x19
+ LayoutCounter (anonymous) at (84,0) size 24x19
+ text run at (84,0) width 24: "\x{25A0}.\x{25A0}"
+ LayoutText {#text} at (108,0) size 4x19
+ text run at (108,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 24x19
+ LayoutInline {<pseudo:before>} at (0,0) size 24x19
+ LayoutCounter (anonymous) at (112,0) size 24x19
+ text run at (112,0) width 24: "\x{25A0}.\x{25A0}"
+ LayoutText {#text} at (136,0) size 4x19
+ text run at (136,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 24x19
+ LayoutInline {<pseudo:before>} at (0,0) size 24x19
+ LayoutCounter (anonymous) at (140,0) size 24x19
+ text run at (140,0) width 24: "\x{25A0}.\x{25A0}"
+ LayoutText {#text} at (164,0) size 4x19
+ text run at (164,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 24x19
+ LayoutInline {<pseudo:before>} at (0,0) size 24x19
+ LayoutCounter (anonymous) at (168,0) size 24x19
+ text run at (168,0) width 24: "\x{25A0}.\x{25A0}"
+ LayoutText {#text} at (192,0) size 4x19
+ text run at (192,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 24x19
+ LayoutInline {<pseudo:before>} at (0,0) size 24x19
+ LayoutCounter (anonymous) at (196,0) size 24x19
+ text run at (196,0) width 24: "\x{25A0}.\x{25A0}"
+ LayoutText {#text} at (220,0) size 4x19
+ text run at (220,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 24x19
+ LayoutInline {<pseudo:before>} at (0,0) size 24x19
+ LayoutCounter (anonymous) at (224,0) size 24x19
+ text run at (224,0) width 24: "\x{25A0}.\x{25A0}"
+ LayoutText {#text} at (248,0) size 4x19
+ text run at (248,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 24x19
+ LayoutInline {<pseudo:before>} at (0,0) size 24x19
+ LayoutCounter (anonymous) at (252,0) size 24x19
+ text run at (252,0) width 24: "\x{25A0}.\x{25A0}"
+ LayoutText {#text} at (276,0) size 4x19
+ text run at (276,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 24x19
+ LayoutInline {<pseudo:before>} at (0,0) size 24x19
+ LayoutCounter (anonymous) at (280,0) size 24x19
+ text run at (280,0) width 24: "\x{25A0}.\x{25A0}"
+ LayoutText {#text} at (304,0) size 4x19
+ text run at (304,0) width 4: " "
+ LayoutInline {SPAN} at (0,0) size 24x19
+ LayoutInline {<pseudo:before>} at (0,0) size 24x19
+ LayoutCounter (anonymous) at (308,0) size 24x19
+ text run at (308,0) width 24: "\x{25A0}.\x{25A0}"
+ LayoutText {#text} at (0,0) size 0x0
+ LayoutNGBlockFlow {DIV} at (0,56) size 784x20
+ LayoutText {#text} at (0,0) size 336x19
+ text run at (0,0) width 12: "\x{25FE}"
+ text run at (12,0) width 4: "."
+ text run at (16,0) width 24: "\x{25FE}\x{25FE}"
+ text run at (40,0) width 4: "."
+ text run at (44,0) width 24: "\x{25FE}\x{25FE}"
+ text run at (68,0) width 4: "."
+ text run at (72,0) width 24: "\x{25FE}\x{25FE}"
+ text run at (96,0) width 4: "."
+ text run at (100,0) width 24: "\x{25FE}\x{25FE}"
+ text run at (124,0) width 4: "."
+ text run at (128,0) width 24: "\x{25FE}\x{25FE}"
+ text run at (152,0) width 4: "."
+ text run at (156,0) width 24: "\x{25FE}\x{25FE}"
+ text run at (180,0) width 4: "."
+ text run at (184,0) width 24: "\x{25FE}\x{25FE}"
+ text run at (208,0) width 4: "."
+ text run at (212,0) width 24: "\x{25FE}\x{25FE}"
+ text run at (236,0) width 4: "."
+ text run at (240,0) width 24: "\x{25FE}\x{25FE}"
+ text run at (264,0) width 4: "."
+ text run at (268,0) width 24: "\x{25FE}\x{25FE}"
+ text run at (292,0) width 4: "."
+ text run at (296,0) width 24: "\x{25FE}\x{25FE}"
+ text run at (320,0) width 4: "."
+ text run at (324,0) width 12: "\x{25FE}"
