Title: [226852] branches/safari-605-branch
- Revision
- 226852
- Author
- jmarc...@apple.com
- Date
- 2018-01-11 20:52:30 -0800 (Thu, 11 Jan 2018)
Log Message
Cherry-pick r226653. rdar://problem/36429147
Modified Paths
Added Paths
Diff
Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226851 => 226852)
--- branches/safari-605-branch/LayoutTests/ChangeLog 2018-01-12 04:52:26 UTC (rev 226851)
+++ branches/safari-605-branch/LayoutTests/ChangeLog 2018-01-12 04:52:30 UTC (rev 226852)
@@ -1,5 +1,21 @@
2018-01-11 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r226653. rdar://problem/36429147
+
+ 2018-01-09 Antti Koivisto <an...@apple.com>
+
+ Blank page except for inner iframes because pending stylesheets cause style.isNotFinal() to be true
+ https://bugs.webkit.org/show_bug.cgi?id=180940
+ <rdar://problem/36116507>
+
+ Reviewed by Darin Adler.
+
+ * http/tests/local/loading-stylesheet-import-remove.html: Added.
+ * http/tests/local/loading-stylesheet-import-remove-expected.html: Added.
+ * http/tests/local/resources/slow-import.css: Added.
+
+2018-01-11 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r226599. rdar://problem/36429130
2018-01-08 Said Abou-Hallawa <sabouhall...@apple.com>
Added: branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove-expected.html (0 => 226852)
--- branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove-expected.html (rev 0)
+++ branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove-expected.html 2018-01-12 04:52:30 UTC (rev 226852)
@@ -0,0 +1,6 @@
+<!doctype html>
+<html>
+<body>
+<h1>CAN YOU SEE ME NOW?</h1>
+</body>
+</html>
Added: branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove.html (0 => 226852)
--- branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove.html (rev 0)
+++ branches/safari-605-branch/LayoutTests/http/tests/local/loading-stylesheet-import-remove.html 2018-01-12 04:52:30 UTC (rev 226852)
@@ -0,0 +1,19 @@
+<!doctype html>
+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+setTimeout(() => {
+ const stylesheet = document.querySelector('link');
+ stylesheet.remove();
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, 100);
+</script>
+<link rel="stylesheet" href=""
+</head>
+<body>
+<h1>CAN YOU SEE ME NOW?</h1>
+</body>
+</html>
Added: branches/safari-605-branch/LayoutTests/http/tests/local/resources/slow-import.css (0 => 226852)
--- branches/safari-605-branch/LayoutTests/http/tests/local/resources/slow-import.css (rev 0)
+++ branches/safari-605-branch/LayoutTests/http/tests/local/resources/slow-import.css 2018-01-12 04:52:30 UTC (rev 226852)
@@ -0,0 +1 @@
+@import url("../slow-css-pass.cgi");
Modified: branches/safari-605-branch/Source/WebCore/ChangeLog (226851 => 226852)
--- branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-12 04:52:26 UTC (rev 226851)
+++ branches/safari-605-branch/Source/WebCore/ChangeLog 2018-01-12 04:52:30 UTC (rev 226852)
@@ -1,5 +1,30 @@
2018-01-11 Jason Marcell <jmarc...@apple.com>
+ Cherry-pick r226653. rdar://problem/36429147
+
+ 2018-01-09 Antti Koivisto <an...@apple.com>
+
+ Blank page except for inner iframes because pending stylesheets cause style.isNotFinal() to be true
+ https://bugs.webkit.org/show_bug.cgi?id=180940
+ <rdar://problem/36116507>
+
+ Reviewed by Darin Adler.
+
+ Test: http/tests/local/loading-stylesheet-import-remove.html
+
+ If a <link> referencing a stylesheet containing an @import that was still loading was removed
+ from the document, the loading state was never cleared. For head stylesheets this blocked
+ rendering permanently.
+
+ Test reduction by Justin Ridgewell.
+
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::removedFromAncestor):
+
+ Test if the stylesheet it loading before clearing the pointer.
+
+2018-01-11 Jason Marcell <jmarc...@apple.com>
+
Cherry-pick r226599. rdar://problem/36429130
2018-01-08 Said Abou-Hallawa <sabouhall...@apple.com>
Modified: branches/safari-605-branch/Source/WebCore/html/HTMLLinkElement.cpp (226851 => 226852)
--- branches/safari-605-branch/Source/WebCore/html/HTMLLinkElement.cpp 2018-01-12 04:52:26 UTC (rev 226851)
+++ branches/safari-605-branch/Source/WebCore/html/HTMLLinkElement.cpp 2018-01-12 04:52:30 UTC (rev 226852)
@@ -365,10 +365,12 @@
m_linkLoader.cancelLoad();
+ bool wasLoading = styleSheetIsLoading();
+
if (m_sheet)
clearSheet();
- if (styleSheetIsLoading())
+ if (wasLoading)
removePendingSheet();
if (m_styleScope) {
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
