Title: [195372] branches/safari-601.1.46-branch/LayoutTests
- Revision
- 195372
- Author
- matthew_han...@apple.com
- Date
- 2016-01-20 13:00:11 -0800 (Wed, 20 Jan 2016)
Log Message
Merge r195089. rdar://problem/24101168
Modified Paths
Diff
Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (195371 => 195372)
--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-20 21:00:05 UTC (rev 195371)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-20 21:00:11 UTC (rev 195372)
@@ -1,5 +1,17 @@
2016-01-20 Matthew Hanson <matthew_han...@apple.com>
+ Merge r195089. rdar://problem/24101168
+
+ 2016-01-14 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Test gardening after r195088
+
+ Unreviewed.
+
+ * http/tests/contentextensions/font-display-none-repeated-layout-expected.txt:
+
+2016-01-20 Matthew Hanson <matthew_han...@apple.com>
+
Merge r195088. rdar://problem/24101168
2016-01-14 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/font-display-none-repeated-layout-expected.txt (195371 => 195372)
--- branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/font-display-none-repeated-layout-expected.txt 2016-01-20 21:00:05 UTC (rev 195371)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/contentextensions/font-display-none-repeated-layout-expected.txt 2016-01-20 21:00:11 UTC (rev 195372)
@@ -1,5 +1,5 @@
-CONSOLE MESSAGE: line 13: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/font-display-none-repeated-layout.html from loading a resource from http://127.0.0.1:8000/resources/Ahem.woff
CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/font-display-none-repeated-layout.html from loading a resource from http://127.0.0.1:8000/resources/Ahem.woff
+CONSOLE MESSAGE: Content blocker prevented frame displaying http://127.0.0.1:8000/contentextensions/font-display-none-repeated-layout.html from loading a resource from http://127.0.0.1:8000/resources/Ahem.woff
Hello
Make sure that a content-blocker rule which is triggered by a webfont and causes display:none on an element doesn't cause looping layouts.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
