Title: [152999] branches/safari-537-branch/LayoutTests
- Revision
- 152999
- Author
- [email protected]
- Date
- 2013-07-22 14:48:54 -0700 (Mon, 22 Jul 2013)
Log Message
Rollout of r152703. <rdar://problem/14209318>
Modified Paths
Diff
Modified: branches/safari-537-branch/LayoutTests/ChangeLog (152998 => 152999)
--- branches/safari-537-branch/LayoutTests/ChangeLog 2013-07-22 21:32:39 UTC (rev 152998)
+++ branches/safari-537-branch/LayoutTests/ChangeLog 2013-07-22 21:48:54 UTC (rev 152999)
@@ -1,5 +1,9 @@
2013-07-22 Lucas Forschler <[email protected]>
+ Rollout r152703
+
+2013-07-22 Lucas Forschler <[email protected]>
+
Merge r152793
2013-07-17 Zalan Bujtas <[email protected]>
Modified: branches/safari-537-branch/LayoutTests/editing/pasteboard/paste-noplugin-expected.txt (152998 => 152999)
--- branches/safari-537-branch/LayoutTests/editing/pasteboard/paste-noplugin-expected.txt 2013-07-22 21:32:39 UTC (rev 152998)
+++ branches/safari-537-branch/LayoutTests/editing/pasteboard/paste-noplugin-expected.txt 2013-07-22 21:48:54 UTC (rev 152999)
@@ -9,15 +9,6 @@
"
| <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>
@@ -27,15 +18,6 @@
| 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: branches/safari-537-branch/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-url-blocked-expected.txt (152998 => 152999)
--- branches/safari-537-branch/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-url-blocked-expected.txt 2013-07-22 21:32:39 UTC (rev 152998)
+++ branches/safari-537-branch/LayoutTests/http/tests/security/contentSecurityPolicy/object-src-url-blocked-expected.txt 2013-07-22 21:48:54 UTC (rev 152999)
@@ -1,5 +1,3 @@
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: branches/safari-537-branch/LayoutTests/platform/mac/accessibility/plugin-expected.txt (152998 => 152999)
--- branches/safari-537-branch/LayoutTests/platform/mac/accessibility/plugin-expected.txt 2013-07-22 21:32:39 UTC (rev 152998)
+++ branches/safari-537-branch/LayoutTests/platform/mac/accessibility/plugin-expected.txt 2013-07-22 21:48:54 UTC (rev 152999)
@@ -2,7 +2,7 @@
AXRole: AXGroup
AXSubrole: (null)
AXRoleDescription: group
-AXChildren: <array of size 1>
+AXChildren: <array of size 0>
AXHelp:
AXParent: <AXGroup>
AXSize: NSSize: {784, 150}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes