Diff
Modified: trunk/LayoutTests/ChangeLog (198225 => 198226)
--- trunk/LayoutTests/ChangeLog 2016-03-15 20:01:39 UTC (rev 198225)
+++ trunk/LayoutTests/ChangeLog 2016-03-15 20:27:39 UTC (rev 198226)
@@ -1,3 +1,24 @@
+2016-03-15 Tim Horton <[email protected]>
+
+ Unskip and rebaseline <attachment> tests on iOS
+ <rdar://problem/24805991>
+
+ * fast/attachment/attachment-default-icon.html:
+ * fast/attachment/attachment-folder-icon.html:
+ * fast/attachment/attachment-type-attribute.html:
+ Make these tests have identical titles between ref and actual, because
+ on iOS the layout differs if you have a title or not (unlike on Mac).
+
+ * platform/ios-simulator/TestExpectations:
+ * platform/ios-simulator/fast/attachment/attachment-label-highlight-expected.txt:
+ * platform/ios-simulator/fast/attachment/attachment-progress-expected.txt:
+ * platform/ios-simulator/fast/attachment/attachment-rendering-expected.txt:
+ * platform/ios-simulator/fast/attachment/attachment-select-on-click-expected.txt:
+ * platform/ios-simulator/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt:
+ * platform/ios-simulator/fast/attachment/attachment-subtitle-expected.txt:
+ * platform/ios-simulator/fast/attachment/attachment-title-expected.txt:
+ Unskip and rebaseline all but one of the attachment tests on iOS.
+
2016-03-15 Ryan Haddad <[email protected]>
Remove flaky expectation for webgl/1.0.2/conformance/rendering/gl-scissor-test.html for mac
Modified: trunk/LayoutTests/fast/attachment/attachment-default-icon.html (198225 => 198226)
--- trunk/LayoutTests/fast/attachment/attachment-default-icon.html 2016-03-15 20:01:39 UTC (rev 198225)
+++ trunk/LayoutTests/fast/attachment/attachment-default-icon.html 2016-03-15 20:27:39 UTC (rev 198226)
@@ -5,6 +5,6 @@
if (window.internals)
window.internals.settings.setAttachmentElementEnabled(true)
</script>
-<attachment></attachment>
+<attachment title=" "></attachment>
</body>
</html>
Modified: trunk/LayoutTests/fast/attachment/attachment-folder-icon.html (198225 => 198226)
--- trunk/LayoutTests/fast/attachment/attachment-folder-icon.html 2016-03-15 20:01:39 UTC (rev 198225)
+++ trunk/LayoutTests/fast/attachment/attachment-folder-icon.html 2016-03-15 20:27:39 UTC (rev 198226)
@@ -5,7 +5,7 @@
window.internals.settings.setAttachmentElementEnabled(true)
</script>
<body>
-<attachment type="multipart/x-folder"></attachment>
-<attachment type="application/vnd.apple.folder"></attachment>
+<attachment title=" " type="multipart/x-folder"></attachment>
+<attachment title=" " type="application/vnd.apple.folder"></attachment>
</body>
</html>
Modified: trunk/LayoutTests/fast/attachment/attachment-type-attribute.html (198225 => 198226)
--- trunk/LayoutTests/fast/attachment/attachment-type-attribute.html 2016-03-15 20:01:39 UTC (rev 198225)
+++ trunk/LayoutTests/fast/attachment/attachment-type-attribute.html 2016-03-15 20:27:39 UTC (rev 198226)
@@ -5,6 +5,6 @@
window.internals.settings.setAttachmentElementEnabled(true)
</script>
<body>
-<attachment type="text/plain"></attachment>
+<attachment type="text/plain" title=" "></attachment>
</body>
</html>
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (198225 => 198226)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-03-15 20:01:39 UTC (rev 198225)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-03-15 20:27:39 UTC (rev 198226)
@@ -252,12 +252,12 @@
fast/text/complex-small-caps-non-bmp-capitalize.html [ Skip ]
fast/text/all-small-caps-whitespace.html [ Skip ]
-# <attachment> support is currently half-baked
-fast/attachment [ Skip ]
-
# This test relies on EventSender.keydown(), which is not supported on iOS
webkit.org/b/155233 fast/events/max-tabindex-focus.html [ Skip ]
+# The file-wrapper part of <attachment> is not yet working on iOS
+fast/attachment/attachment-type-attribute.html [ Skip ]
+
###
# Known failures
##
Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-label-highlight-expected.txt (198225 => 198226)
--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-label-highlight-expected.txt 2016-03-15 20:01:39 UTC (rev 198225)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-label-highlight-expected.txt 2016-03-15 20:27:39 UTC (rev 198226)
@@ -1,14 +1,14 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x36
- RenderBlock {HTML} at (0,0) size 800x36
- RenderBody {BODY} at (8,8) size 784x20
- RenderAttachment {ATTACHMENT} at (0,16) size 0x0
- RenderAttachment {ATTACHMENT} at (0,16) size 0x0
- RenderAttachment {ATTACHMENT} at (0,16) size 0x0
- RenderAttachment {ATTACHMENT} at (0,16) size 0x0
- RenderAttachment {ATTACHMENT} at (0,16) size 0x0
- RenderAttachment {ATTACHMENT} at (0,16) size 0x0
+layer at (0,0) size 800x284
+ RenderBlock {HTML} at (0,0) size 800x284
+ RenderBody {BODY} at (8,8) size 784x268
+ RenderAttachment {ATTACHMENT} at (0,15) size 160x119
+ RenderAttachment {ATTACHMENT} at (160,15) size 160x119
+ RenderAttachment {ATTACHMENT} at (320,15) size 160x119
+ RenderAttachment {ATTACHMENT} at (480,15) size 160x119
+ RenderAttachment {ATTACHMENT} at (0,149) size 160x119
+ RenderAttachment {ATTACHMENT} at (160,149) size 160x119
RenderText {#text} at (0,0) size 0x0
selection start: position 0 of child 2 {ATTACHMENT} of body
selection end: position 1 of child 7 {ATTACHMENT} of body
Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-progress-expected.txt (198225 => 198226)
--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-progress-expected.txt 2016-03-15 20:01:39 UTC (rev 198225)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-progress-expected.txt 2016-03-15 20:27:39 UTC (rev 198226)
@@ -1,29 +1,29 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x36
- RenderBlock {HTML} at (0,0) size 800x36
- RenderBody {BODY} at (8,8) size 784x20
- RenderAttachment {ATTACHMENT} at (0,16) size 0x0
- RenderText {#text} at (0,0) size 4x19
- text run at (0,0) width 4: " "
- RenderAttachment {ATTACHMENT} at (4,16) size 0x0
- RenderText {#text} at (4,0) size 4x19
- text run at (4,0) width 4: " "
- RenderAttachment {ATTACHMENT} at (8,16) size 0x0
- RenderText {#text} at (8,0) size 4x19
- text run at (8,0) width 4: " "
- RenderAttachment {ATTACHMENT} at (12,16) size 0x0
- RenderText {#text} at (12,0) size 4x19
- text run at (12,0) width 4: " "
- RenderAttachment {ATTACHMENT} at (16,16) size 0x0
- RenderText {#text} at (16,0) size 4x19
- text run at (16,0) width 4: " "
- RenderAttachment {ATTACHMENT} at (20,16) size 0x0
- RenderText {#text} at (20,0) size 4x19
- text run at (20,0) width 4: " "
- RenderAttachment {ATTACHMENT} at (24,16) size 0x0
- RenderText {#text} at (24,0) size 4x19
- text run at (24,0) width 4: " "
- RenderAttachment {ATTACHMENT} at (28,16) size 0x0
+layer at (0,0) size 800x284
+ RenderBlock {HTML} at (0,0) size 800x284
+ RenderBody {BODY} at (8,8) size 784x268
+ RenderAttachment {ATTACHMENT} at (0,15) size 160x119
+ RenderText {#text} at (160,0) size 4x19
+ text run at (160,0) width 4: " "
+ RenderAttachment {ATTACHMENT} at (164,15) size 160x119
+ RenderText {#text} at (324,0) size 4x19
+ text run at (324,0) width 4: " "
+ RenderAttachment {ATTACHMENT} at (328,15) size 160x119
+ RenderText {#text} at (488,0) size 4x19
+ text run at (488,0) width 4: " "
+ RenderAttachment {ATTACHMENT} at (492,15) size 160x119
+ RenderText {#text} at (652,0) size 4x19
+ text run at (652,0) width 4: " "
+ RenderAttachment {ATTACHMENT} at (0,149) size 160x119
+ RenderText {#text} at (160,134) size 4x19
+ text run at (160,134) width 4: " "
+ RenderAttachment {ATTACHMENT} at (164,149) size 160x119
+ RenderText {#text} at (324,134) size 4x19
+ text run at (324,134) width 4: " "
+ RenderAttachment {ATTACHMENT} at (328,149) size 160x119
+ RenderText {#text} at (488,134) size 4x19
+ text run at (488,134) width 4: " "
+ RenderAttachment {ATTACHMENT} at (492,149) size 160x119
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-rendering-expected.txt (198225 => 198226)
--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-rendering-expected.txt 2016-03-15 20:01:39 UTC (rev 198225)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-rendering-expected.txt 2016-03-15 20:27:39 UTC (rev 198226)
@@ -6,6 +6,6 @@
RenderBlock {P} at (0,0) size 784x20
RenderText {#text} at (0,0) size 326x19
text run at (0,0) width 326: "This tests that attachments have a custom renderer."
- RenderBlock (anonymous) at (0,36) size 784x0
- RenderAttachment {ATTACHMENT} at (0,0) size 0x0
+ RenderBlock (anonymous) at (0,36) size 784x119
+ RenderAttachment {ATTACHMENT} at (0,0) size 160x119
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-expected.txt (198225 => 198226)
--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-expected.txt 2016-03-15 20:01:39 UTC (rev 198225)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-expected.txt 2016-03-15 20:27:39 UTC (rev 198226)
@@ -1,11 +1,11 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x36
- RenderBlock {HTML} at (0,0) size 800x36
- RenderBody {BODY} at (8,8) size 784x20
- RenderBlock {DIV} at (0,0) size 784x20
+layer at (0,0) size 800x150
+ RenderBlock {HTML} at (0,0) size 800x150
+ RenderBody {BODY} at (8,8) size 784x134
+ RenderBlock {DIV} at (0,0) size 784x134
RenderText {#text} at (0,0) size 73x19
text run at (0,0) width 73: "text before "
- RenderAttachment {ATTACHMENT} at (72,16) size 0x0
- RenderText {#text} at (72,0) size 63x19
- text run at (72,0) width 63: " text after"
+ RenderAttachment {ATTACHMENT} at (72,15) size 161x119
+ RenderText {#text} at (232,0) size 63x19
+ text run at (232,0) width 63: " text after"
Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt (198225 => 198226)
--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt 2016-03-15 20:01:39 UTC (rev 198225)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-select-on-click-inside-user-select-all-expected.txt 2016-03-15 20:27:39 UTC (rev 198226)
@@ -1,11 +1,11 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x36
- RenderBlock {HTML} at (0,0) size 800x36
- RenderBody {BODY} at (8,8) size 784x20
- RenderBlock {DIV} at (0,0) size 784x20
+layer at (0,0) size 800x150
+ RenderBlock {HTML} at (0,0) size 800x150
+ RenderBody {BODY} at (8,8) size 784x134
+ RenderBlock {DIV} at (0,0) size 784x134
RenderText {#text} at (0,0) size 73x19
text run at (0,0) width 73: "text before "
- RenderAttachment {ATTACHMENT} at (72,16) size 0x0
- RenderText {#text} at (72,0) size 63x19
- text run at (72,0) width 63: " text after"
+ RenderAttachment {ATTACHMENT} at (72,15) size 161x119
+ RenderText {#text} at (232,0) size 63x19
+ text run at (232,0) width 63: " text after"
Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-subtitle-expected.txt (198225 => 198226)
--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-subtitle-expected.txt 2016-03-15 20:01:39 UTC (rev 198225)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-subtitle-expected.txt 2016-03-15 20:27:39 UTC (rev 198226)
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x36
- RenderBlock {HTML} at (0,0) size 800x36
- RenderBody {BODY} at (8,8) size 784x20
- RenderAttachment {ATTACHMENT} at (0,16) size 0x0
+layer at (0,0) size 800x150
+ RenderBlock {HTML} at (0,0) size 800x150
+ RenderBody {BODY} at (8,8) size 784x134
+ RenderAttachment {ATTACHMENT} at (0,15) size 160x119
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
Modified: trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-title-expected.txt (198225 => 198226)
--- trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-title-expected.txt 2016-03-15 20:01:39 UTC (rev 198225)
+++ trunk/LayoutTests/platform/ios-simulator/fast/attachment/attachment-title-expected.txt 2016-03-15 20:27:39 UTC (rev 198226)
@@ -1,8 +1,8 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x36
- RenderBlock {HTML} at (0,0) size 800x36
- RenderBody {BODY} at (8,8) size 784x20
- RenderAttachment {ATTACHMENT} at (0,16) size 0x0
+layer at (0,0) size 800x150
+ RenderBlock {HTML} at (0,0) size 800x150
+ RenderBody {BODY} at (8,8) size 784x134
+ RenderAttachment {ATTACHMENT} at (0,15) size 160x119
RenderText {#text} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
