Diff
Modified: trunk/LayoutTests/ChangeLog (183149 => 183150)
--- trunk/LayoutTests/ChangeLog 2015-04-22 22:57:29 UTC (rev 183149)
+++ trunk/LayoutTests/ChangeLog 2015-04-22 22:59:40 UTC (rev 183150)
@@ -1,5 +1,20 @@
2015-04-22 Alexey Proskuryakov <[email protected]>
+ Update results for two CSS tests affected by new fonts in OS X 10.10.3.
+
+ * platform/mac-mavericks/css2.1: Added.
+ * platform/mac-mavericks/css2.1/t1202-counter-04-b-expected.png: Copied from LayoutTests/platform/mac/css2.1/t1202-counter-04-b-expected.png.
+ * platform/mac-mavericks/css2.1/t1202-counter-04-b-expected.txt: Copied from LayoutTests/platform/mac/css2.1/t1202-counter-04-b-expected.txt.
+ * platform/mac-mavericks/css2.1/t1202-counters-04-b-expected.png: Copied from LayoutTests/platform/mac/css2.1/t1202-counters-04-b-expected.png.
+ * platform/mac-mavericks/css2.1/t1202-counters-04-b-expected.txt: Copied from LayoutTests/platform/mac/css2.1/t1202-counters-04-b-expected.txt.
+ * platform/mac/TestExpectations:
+ * platform/mac/css2.1/t1202-counter-04-b-expected.png:
+ * platform/mac/css2.1/t1202-counter-04-b-expected.txt:
+ * platform/mac/css2.1/t1202-counters-04-b-expected.png:
+ * platform/mac/css2.1/t1202-counters-04-b-expected.txt:
+
+2015-04-22 Alexey Proskuryakov <[email protected]>
+
fast/text/emoji.html passes on OS X 10.10.3 and higher.
* platform/mac/TestExpectations: Mark it as such.
Modified: trunk/LayoutTests/platform/mac/TestExpectations (183149 => 183150)
--- trunk/LayoutTests/platform/mac/TestExpectations 2015-04-22 22:57:29 UTC (rev 183149)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2015-04-22 22:59:40 UTC (rev 183150)
@@ -1221,11 +1221,6 @@
# Sometimes has an extra space at the end
fast/forms/focus-selection-textarea.html [ Pass Failure ]
-# These results are font dependent, see rdar://problem/19848737
-# Also, these tests may be affected by flakiness, see webkit.org/b/139968.
-[ Yosemite ] css2.1/t1202-counter-04-b.html [ Pass Failure ]
-[ Yosemite ] css2.1/t1202-counters-04-b.html [ Pass Failure ]
-
# webkit.org/b/141252 [ Release Yosemite+ ] inspector/css/selector-dynamic-specificity.html [ Slow ]
# webkit.org/b/141252 [ Debug Yosemite+ ] inspector/css/selector-dynamic-specificity.html [ Pass Timeout ]
webkit.org/b/141118 inspector/css/selector-dynamic-specificity.html [ Skip ]
Modified: trunk/LayoutTests/platform/mac/css2.1/t1202-counter-04-b-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/css2.1/t1202-counter-04-b-expected.txt (183149 => 183150)
--- trunk/LayoutTests/platform/mac/css2.1/t1202-counter-04-b-expected.txt 2015-04-22 22:57:29 UTC (rev 183149)
+++ trunk/LayoutTests/platform/mac/css2.1/t1202-counter-04-b-expected.txt 2015-04-22 22:59:40 UTC (rev 183150)
@@ -84,16 +84,16 @@
text run at (139,1) width 10: "\x{25A0}"
RenderText {#text} at (0,0) size 0x0
RenderBlock {DIV} at (0,53) size 784x21
- RenderText {#text} at (0,2) size 284x18
- text run at (0,2) width 24: "\x{25FE} "
- text run at (24,2) width 24: "\x{25FE} "
- text run at (48,2) width 24: "\x{25FE} "
- text run at (72,2) width 24: "\x{25FE} "
- text run at (96,2) width 24: "\x{25FE} "
- text run at (120,2) width 24: "\x{25FE} "
- text run at (144,2) width 24: "\x{25FE} "
- text run at (168,2) width 24: "\x{25FE} "
- text run at (192,2) width 24: "\x{25FE} "
- text run at (216,2) width 24: "\x{25FE} "
- text run at (240,2) width 24: "\x{25FE} "
- text run at (264,2) width 20: "\x{25FE}"
+ RenderText {#text} at (0,2) size 296x18
+ text run at (0,2) width 25: "\x{25FE} "
+ text run at (25,2) width 25: "\x{25FE} "
+ text run at (50,2) width 25: "\x{25FE} "
+ text run at (75,2) width 25: "\x{25FE} "
+ text run at (100,2) width 25: "\x{25FE} "
+ text run at (125,2) width 25: "\x{25FE} "
+ text run at (150,2) width 25: "\x{25FE} "
+ text run at (175,2) width 25: "\x{25FE} "
+ text run at (200,2) width 25: "\x{25FE} "
+ text run at (225,2) width 25: "\x{25FE} "
+ text run at (250,2) width 25: "\x{25FE} "
+ text run at (275,2) width 21: "\x{25FE}"
Modified: trunk/LayoutTests/platform/mac/css2.1/t1202-counters-04-b-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/css2.1/t1202-counters-04-b-expected.txt (183149 => 183150)
--- trunk/LayoutTests/platform/mac/css2.1/t1202-counters-04-b-expected.txt 2015-04-22 22:57:29 UTC (rev 183149)
+++ trunk/LayoutTests/platform/mac/css2.1/t1202-counters-04-b-expected.txt 2015-04-22 22:59:40 UTC (rev 183150)
@@ -84,16 +84,16 @@
text run at (278,1) width 23: "\x{25A0}.\x{25A0}"
RenderText {#text} at (0,0) size 0x0
RenderBlock {DIV} at (0,53) size 784x21
- RenderText {#text} at (0,2) size 572x18
- text run at (0,2) width 48: "\x{25FE}.\x{25FE} "
- text run at (48,2) width 48: "\x{25FE}.\x{25FE} "
- text run at (96,2) width 48: "\x{25FE}.\x{25FE} "
- text run at (144,2) width 48: "\x{25FE}.\x{25FE} "
- text run at (192,2) width 48: "\x{25FE}.\x{25FE} "
- text run at (240,2) width 48: "\x{25FE}.\x{25FE} "
- text run at (288,2) width 48: "\x{25FE}.\x{25FE} "
- text run at (336,2) width 48: "\x{25FE}.\x{25FE} "
- text run at (384,2) width 48: "\x{25FE}.\x{25FE} "
- text run at (432,2) width 48: "\x{25FE}.\x{25FE} "
- text run at (480,2) width 48: "\x{25FE}.\x{25FE} "
- text run at (528,2) width 44: "\x{25FE}.\x{25FE}"
+ RenderText {#text} at (0,2) size 596x18
+ text run at (0,2) width 50: "\x{25FE}.\x{25FE} "
+ text run at (50,2) width 50: "\x{25FE}.\x{25FE} "
+ text run at (100,2) width 50: "\x{25FE}.\x{25FE} "
+ text run at (150,2) width 50: "\x{25FE}.\x{25FE} "
+ text run at (200,2) width 50: "\x{25FE}.\x{25FE} "
+ text run at (250,2) width 50: "\x{25FE}.\x{25FE} "
+ text run at (300,2) width 50: "\x{25FE}.\x{25FE} "
+ text run at (350,2) width 50: "\x{25FE}.\x{25FE} "
+ text run at (400,2) width 50: "\x{25FE}.\x{25FE} "
+ text run at (450,2) width 50: "\x{25FE}.\x{25FE} "
+ text run at (500,2) width 50: "\x{25FE}.\x{25FE} "
+ text run at (550,2) width 46: "\x{25FE}.\x{25FE}"
Copied: trunk/LayoutTests/platform/mac-mavericks/css2.1/t1202-counter-04-b-expected.png (from rev 183013, trunk/LayoutTests/platform/mac/css2.1/t1202-counter-04-b-expected.png)
(Binary files differ)
Copied: trunk/LayoutTests/platform/mac-mavericks/css2.1/t1202-counter-04-b-expected.txt (from rev 183013, trunk/LayoutTests/platform/mac/css2.1/t1202-counter-04-b-expected.txt) (0 => 183150)
--- trunk/LayoutTests/platform/mac-mavericks/css2.1/t1202-counter-04-b-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/css2.1/t1202-counter-04-b-expected.txt 2015-04-22 22:59:40 UTC (rev 183150)
@@ -0,0 +1,99 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x98
+ RenderBlock {HTML} at (0,0) size 800x98
+ RenderBody {BODY} at (8,16) size 784x74
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 237x18
+ text run at (0,0) width 237: "The following two lines should look "
+ RenderInline {EM} at (0,0) size 93x18
+ RenderText {#text} at (236,0) size 93x18
+ text run at (236,0) width 93: "approximately"
+ RenderText {#text} at (328,0) size 66x18
+ text run at (328,0) width 66: " the same:"
+ RenderBlock {DIV} at (0,34) size 784x19
+ RenderInline {SPAN} at (0,0) size 9x18
+ RenderInline (generated) at (0,0) size 9x18
+ RenderCounter at (0,1) size 9x18
+ text run at (0,1) width 9: "\x{25A0}"
+ RenderText {#text} at (8,1) size 5x18
+ text run at (8,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 10x18
+ RenderInline (generated) at (0,0) size 10x18
+ RenderCounter at (12,1) size 10x18
+ text run at (12,1) width 10: "\x{25A0}"
+ RenderText {#text} at (21,1) size 5x18
+ text run at (21,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 10x18
+ RenderInline (generated) at (0,0) size 10x18
+ RenderCounter at (25,1) size 10x18
+ text run at (25,1) width 10: "\x{25A0}"
+ RenderText {#text} at (34,1) size 5x18
+ text run at (34,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 9x18
+ RenderInline (generated) at (0,0) size 9x18
+ RenderCounter at (38,1) size 9x18
+ text run at (38,1) width 9: "\x{25A0}"
+ RenderText {#text} at (46,1) size 5x18
+ text run at (46,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 10x18
+ RenderInline (generated) at (0,0) size 10x18
+ RenderCounter at (50,1) size 10x18
+ text run at (50,1) width 10: "\x{25A0}"
+ RenderText {#text} at (59,1) size 5x18
+ text run at (59,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 10x18
+ RenderInline (generated) at (0,0) size 10x18
+ RenderCounter at (63,1) size 10x18
+ text run at (63,1) width 10: "\x{25A0}"
+ RenderText {#text} at (72,1) size 5x18
+ text run at (72,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 9x18
+ RenderInline (generated) at (0,0) size 9x18
+ RenderCounter at (76,1) size 9x18
+ text run at (76,1) width 9: "\x{25A0}"
+ RenderText {#text} at (84,1) size 5x18
+ text run at (84,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 10x18
+ RenderInline (generated) at (0,0) size 10x18
+ RenderCounter at (88,1) size 10x18
+ text run at (88,1) width 10: "\x{25A0}"
+ RenderText {#text} at (97,1) size 5x18
+ text run at (97,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 10x18
+ RenderInline (generated) at (0,0) size 10x18
+ RenderCounter at (101,1) size 10x18
+ text run at (101,1) width 10: "\x{25A0}"
+ RenderText {#text} at (110,1) size 5x18
+ text run at (110,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 9x18
+ RenderInline (generated) at (0,0) size 9x18
+ RenderCounter at (114,1) size 9x18
+ text run at (114,1) width 9: "\x{25A0}"
+ RenderText {#text} at (122,1) size 5x18
+ text run at (122,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 10x18
+ RenderInline (generated) at (0,0) size 10x18
+ RenderCounter at (126,1) size 10x18
+ text run at (126,1) width 10: "\x{25A0}"
+ RenderText {#text} at (135,1) size 5x18
+ text run at (135,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 10x18
+ RenderInline (generated) at (0,0) size 10x18
+ RenderCounter at (139,1) size 10x18
+ text run at (139,1) width 10: "\x{25A0}"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,53) size 784x21
+ RenderText {#text} at (0,2) size 284x18
+ text run at (0,2) width 24: "\x{25FE} "
+ text run at (24,2) width 24: "\x{25FE} "
+ text run at (48,2) width 24: "\x{25FE} "
+ text run at (72,2) width 24: "\x{25FE} "
+ text run at (96,2) width 24: "\x{25FE} "
+ text run at (120,2) width 24: "\x{25FE} "
+ text run at (144,2) width 24: "\x{25FE} "
+ text run at (168,2) width 24: "\x{25FE} "
+ text run at (192,2) width 24: "\x{25FE} "
+ text run at (216,2) width 24: "\x{25FE} "
+ text run at (240,2) width 24: "\x{25FE} "
+ text run at (264,2) width 20: "\x{25FE}"
Copied: trunk/LayoutTests/platform/mac-mavericks/css2.1/t1202-counters-04-b-expected.png (from rev 183013, trunk/LayoutTests/platform/mac/css2.1/t1202-counters-04-b-expected.png)
(Binary files differ)
Copied: trunk/LayoutTests/platform/mac-mavericks/css2.1/t1202-counters-04-b-expected.txt (from rev 183013, trunk/LayoutTests/platform/mac/css2.1/t1202-counters-04-b-expected.txt) (0 => 183150)
--- trunk/LayoutTests/platform/mac-mavericks/css2.1/t1202-counters-04-b-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/css2.1/t1202-counters-04-b-expected.txt 2015-04-22 22:59:40 UTC (rev 183150)
@@ -0,0 +1,99 @@
+layer at (0,0) size 800x600
+ RenderView at (0,0) size 800x600
+layer at (0,0) size 800x98
+ RenderBlock {HTML} at (0,0) size 800x98
+ RenderBody {BODY} at (8,16) size 784x74
+ RenderBlock {P} at (0,0) size 784x18
+ RenderText {#text} at (0,0) size 237x18
+ text run at (0,0) width 237: "The following two lines should look "
+ RenderInline {EM} at (0,0) size 93x18
+ RenderText {#text} at (236,0) size 93x18
+ text run at (236,0) width 93: "approximately"
+ RenderText {#text} at (328,0) size 66x18
+ text run at (328,0) width 66: " the same:"
+ RenderBlock {DIV} at (0,34) size 784x19
+ RenderInline {SPAN} at (0,0) size 22x18
+ RenderInline (generated) at (0,0) size 22x18
+ RenderCounter at (0,1) size 22x18
+ text run at (0,1) width 22: "\x{25A0}.\x{25A0}"
+ RenderText {#text} at (21,1) size 5x18
+ text run at (21,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 22x18
+ RenderInline (generated) at (0,0) size 22x18
+ RenderCounter at (25,1) size 22x18
+ text run at (25,1) width 22: "\x{25A0}.\x{25A0}"
+ RenderText {#text} at (46,1) size 5x18
+ text run at (46,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 23x18
+ RenderInline (generated) at (0,0) size 23x18
+ RenderCounter at (50,1) size 23x18
+ text run at (50,1) width 23: "\x{25A0}.\x{25A0}"
+ RenderText {#text} at (72,1) size 5x18
+ text run at (72,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 22x18
+ RenderInline (generated) at (0,0) size 22x18
+ RenderCounter at (76,1) size 22x18
+ text run at (76,1) width 22: "\x{25A0}.\x{25A0}"
+ RenderText {#text} at (97,1) size 5x18
+ text run at (97,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 22x18
+ RenderInline (generated) at (0,0) size 22x18
+ RenderCounter at (101,1) size 22x18
+ text run at (101,1) width 22: "\x{25A0}.\x{25A0}"
+ RenderText {#text} at (122,1) size 5x18
+ text run at (122,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 23x18
+ RenderInline (generated) at (0,0) size 23x18
+ RenderCounter at (126,1) size 23x18
+ text run at (126,1) width 23: "\x{25A0}.\x{25A0}"
+ RenderText {#text} at (148,1) size 5x18
+ text run at (148,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 22x18
+ RenderInline (generated) at (0,0) size 22x18
+ RenderCounter at (152,1) size 22x18
+ text run at (152,1) width 22: "\x{25A0}.\x{25A0}"
+ RenderText {#text} at (173,1) size 5x18
+ text run at (173,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 22x18
+ RenderInline (generated) at (0,0) size 22x18
+ RenderCounter at (177,1) size 22x18
+ text run at (177,1) width 22: "\x{25A0}.\x{25A0}"
+ RenderText {#text} at (198,1) size 5x18
+ text run at (198,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 23x18
+ RenderInline (generated) at (0,0) size 23x18
+ RenderCounter at (202,1) size 23x18
+ text run at (202,1) width 23: "\x{25A0}.\x{25A0}"
+ RenderText {#text} at (224,1) size 5x18
+ text run at (224,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 22x18
+ RenderInline (generated) at (0,0) size 22x18
+ RenderCounter at (228,1) size 22x18
+ text run at (228,1) width 22: "\x{25A0}.\x{25A0}"
+ RenderText {#text} at (249,1) size 5x18
+ text run at (249,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 22x18
+ RenderInline (generated) at (0,0) size 22x18
+ RenderCounter at (253,1) size 22x18
+ text run at (253,1) width 22: "\x{25A0}.\x{25A0}"
+ RenderText {#text} at (274,1) size 5x18
+ text run at (274,1) width 5: " "
+ RenderInline {SPAN} at (0,0) size 23x18
+ RenderInline (generated) at (0,0) size 23x18
+ RenderCounter at (278,1) size 23x18
+ text run at (278,1) width 23: "\x{25A0}.\x{25A0}"
+ RenderText {#text} at (0,0) size 0x0
+ RenderBlock {DIV} at (0,53) size 784x21
+ RenderText {#text} at (0,2) size 572x18
+ text run at (0,2) width 48: "\x{25FE}.\x{25FE} "
+ text run at (48,2) width 48: "\x{25FE}.\x{25FE} "
+ text run at (96,2) width 48: "\x{25FE}.\x{25FE} "
+ text run at (144,2) width 48: "\x{25FE}.\x{25FE} "
+ text run at (192,2) width 48: "\x{25FE}.\x{25FE} "
+ text run at (240,2) width 48: "\x{25FE}.\x{25FE} "
+ text run at (288,2) width 48: "\x{25FE}.\x{25FE} "
+ text run at (336,2) width 48: "\x{25FE}.\x{25FE} "
+ text run at (384,2) width 48: "\x{25FE}.\x{25FE} "
+ text run at (432,2) width 48: "\x{25FE}.\x{25FE} "
+ text run at (480,2) width 48: "\x{25FE}.\x{25FE} "
+ text run at (528,2) width 44: "\x{25FE}.\x{25FE}"
