Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Unified Diff: third_party/WebKit/Source/core/dom/StyleSheetCandidate.cpp

Issue 1867513002: Don't apply style elements or PIs with loading imports. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Do the same for processing instructions Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/css/ignore-pending-style-import-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/StyleSheetCandidate.cpp
diff --git a/third_party/WebKit/Source/core/dom/StyleSheetCandidate.cpp b/third_party/WebKit/Source/core/dom/StyleSheetCandidate.cpp
index f4e5551a159119b7d40a74ff49c61b26e91885e7..d49bb546efb065256e41893994528ef26184fbef 100644
--- a/third_party/WebKit/Source/core/dom/StyleSheetCandidate.cpp
+++ b/third_party/WebKit/Source/core/dom/StyleSheetCandidate.cpp
@@ -79,7 +79,11 @@ bool StyleSheetCandidate::isEnabledViaScript() const
bool StyleSheetCandidate::isEnabledAndLoading() const
{
- return isHTMLLink() && !toHTMLLinkElement(node()).isDisabled() && toHTMLLinkElement(node()).styleSheetIsLoading();
+ if (isHTMLLink())
+ return !toHTMLLinkElement(node()).isDisabled() && toHTMLLinkElement(node()).styleSheetIsLoading();
+
+ StyleSheet* sheet = this->sheet();
esprehn 2016/04/06 21:03:17 hmm, can we not make this->sheet() and sheet->disa
rune 2016/04/06 22:01:46 Sheet is null while top-level css is loading for <
+ return sheet && !sheet->disabled() && sheet->isLoading();
}
bool StyleSheetCandidate::hasPreferrableName() const
« no previous file with comments | « third_party/WebKit/LayoutTests/http/tests/css/ignore-pending-style-import-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698