Title: [187656] branches/safari-601.1-branch/LayoutTests
- Revision
- 187656
- Author
- [email protected]
- Date
- 2015-07-31 10:49:38 -0700 (Fri, 31 Jul 2015)
Log Message
Merged r187512. rdar://problem/22010303
Modified Paths
Diff
Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (187655 => 187656)
--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-31 17:49:15 UTC (rev 187655)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-31 17:49:38 UTC (rev 187656)
@@ -1,5 +1,15 @@
2015-07-31 Lucas Forschler <[email protected]>
+ Merge r187512
+
+ 2015-07-28 Chris Dumez <[email protected]>
+
+ Unreviewed, fix wrong test baseline landed in r187489.
+
+ * http/tests/security/same-origin-css-4-expected.txt:
+
+2015-07-31 Lucas Forschler <[email protected]>
+
Merge r187489
2015-07-28 Chris Dumez <[email protected]>
Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-4-expected.txt (187655 => 187656)
--- branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-4-expected.txt 2015-07-31 17:49:15 UTC (rev 187655)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-4-expected.txt 2015-07-31 17:49:38 UTC (rev 187656)
@@ -1,3 +1,4 @@
+CONSOLE MESSAGE: Did not parse stylesheet at 'http://127.0.0.1:8000/security/resources/xorigincss3.html' because non CSS MIME types are not allowed in strict mode.
PASS Testing same-origin and MIME behavior for CSS.
PASS xorigincss3.html should not be loaded, even though it is same-origin
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
