Title: [152729] tags/Safari-537.51/LayoutTests
- Revision
- 152729
- Author
- [email protected]
- Date
- 2013-07-16 09:51:54 -0700 (Tue, 16 Jul 2013)
Log Message
Merged r152703. <rdar://problem/14209318>
Modified Paths
Diff
Modified: tags/Safari-537.51/LayoutTests/ChangeLog (152728 => 152729)
--- tags/Safari-537.51/LayoutTests/ChangeLog 2013-07-16 16:51:04 UTC (rev 152728)
+++ tags/Safari-537.51/LayoutTests/ChangeLog 2013-07-16 16:51:54 UTC (rev 152729)
@@ -1,3 +1,15 @@
+2013-07-16 Lucas Forschler <[email protected]>
+
+ Merge r152703
+
+ 2013-07-15 Tim Horton <[email protected]>
+
+ Unreviewed rebaselines after r152701.
+
+ * editing/pasteboard/paste-noplugin-expected.txt:
+ * http/tests/security/contentSecurityPolicy/object-src-url-blocked-expected.txt:
+ * platform/mac/accessibility/plugin-expected.txt:
+
2013-07-15 Lucas Forschler <[email protected]>
Merge r152653
Modified: tags/Safari-537.51/LayoutTests/editing/pasteboard/paste-noplugin-expected.txt (152728 => 152729)
--- tags/Safari-537.51/LayoutTests/editing/pasteboard/paste-noplugin-expected.txt 2013-07-16 16:51:04 UTC (rev 152728)
+++ tags/Safari-537.51/LayoutTests/editing/pasteboard/paste-noplugin-expected.txt 2013-07-16 16:51:54 UTC (rev 152729)
@@ -9,6 +9,15 @@
"
| <embed>
| src=""
+| <shadow:root>
+| <div>
+| pseudo="-webkit-unavailable-plugin-content"
+| shadow:pseudoId="-webkit-unavailable-plugin-content"
+| <div>
+| <span>
+| role="button"
+| "Missing Plug-in"
+| <img>
| "
"
| <object>
@@ -18,6 +27,15 @@
| value="http://localhost:8000/evil.swf"
| <embed>
| src=""
+| <shadow:root>
+| <div>
+| pseudo="-webkit-unavailable-plugin-content"
+| shadow:pseudoId="-webkit-unavailable-plugin-content"
+| <div>
+| <span>
+| role="button"
+| "Missing Plug-in"
+| <img>
| "
"
Modified: tags/Safari-537.51/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-url-blocked-expected.txt (152728 => 152729)
--- tags/Safari-537.51/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-url-blocked-expected.txt 2013-07-16 16:51:04 UTC (rev 152728)
+++ tags/Safari-537.51/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-url-blocked-expected.txt 2013-07-16 16:51:54 UTC (rev 152729)
@@ -1,3 +1,5 @@
CONSOLE MESSAGE: Refused to load plugin data from 'http://127.0.0.1:8000/plugins/resources/mock-plugin.pl' because it violates the following Content Security Policy directive: "object-src 'none'".
+CONSOLE MESSAGE: Refused to load plugin data from 'http://127.0.0.1:8000/plugins/resources/mock-plugin.pl' because it violates the following Content Security Policy directive: "object-src 'none'".
+
This test passes if there is a console message saying the plugin was blocked.
Modified: tags/Safari-537.51/LayoutTests/platform/mac/accessibility/plugin-expected.txt (152728 => 152729)
--- tags/Safari-537.51/LayoutTests/platform/mac/accessibility/plugin-expected.txt 2013-07-16 16:51:04 UTC (rev 152728)
+++ tags/Safari-537.51/LayoutTests/platform/mac/accessibility/plugin-expected.txt 2013-07-16 16:51:54 UTC (rev 152729)
@@ -2,7 +2,7 @@
AXRole: AXGroup
AXSubrole: (null)
AXRoleDescription: group
-AXChildren: <array of size 0>
+AXChildren: <array of size 1>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {784, 150}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
