Title: [206167] trunk/Source/WebCore
- Revision
- 206167
- Author
- an...@apple.com
- Date
- 2016-09-20 13:05:31 -0700 (Tue, 20 Sep 2016)
Log Message
Remove AuthorStyleSheets::m_hadActiveLoadingStylesheet bit
https://bugs.webkit.org/show_bug.cgi?id=162312
Reviewed by Chris Dumez.
* dom/AuthorStyleSheets.cpp:
(WebCore::AuthorStyleSheets::analyzeStyleSheetChange):
We can handle loading sheets with the normal stylesheet change logic. Remove the special case.
(WebCore::filterEnabledNonemptyCSSStyleSheets):
Filter out loading stylesheets.
* dom/AuthorStyleSheets.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (206166 => 206167)
--- trunk/Source/WebCore/ChangeLog 2016-09-20 20:03:45 UTC (rev 206166)
+++ trunk/Source/WebCore/ChangeLog 2016-09-20 20:05:31 UTC (rev 206167)
@@ -1,3 +1,21 @@
+2016-09-20 Antti Koivisto <an...@apple.com>
+
+ Remove AuthorStyleSheets::m_hadActiveLoadingStylesheet bit
+ https://bugs.webkit.org/show_bug.cgi?id=162312
+
+ Reviewed by Chris Dumez.
+
+ * dom/AuthorStyleSheets.cpp:
+ (WebCore::AuthorStyleSheets::analyzeStyleSheetChange):
+
+ We can handle loading sheets with the normal stylesheet change logic. Remove the special case.
+
+ (WebCore::filterEnabledNonemptyCSSStyleSheets):
+
+ Filter out loading stylesheets.
+
+ * dom/AuthorStyleSheets.h:
+
2016-09-20 Keith Rollin <krol...@apple.com>
Adjust current networking logging
Modified: trunk/Source/WebCore/dom/AuthorStyleSheets.cpp (206166 => 206167)
--- trunk/Source/WebCore/dom/AuthorStyleSheets.cpp 2016-09-20 20:03:45 UTC (rev 206166)
+++ trunk/Source/WebCore/dom/AuthorStyleSheets.cpp 2016-09-20 20:05:31 UTC (rev 206167)
@@ -215,18 +215,7 @@
{
requiresFullStyleRecalc = true;
- // Stylesheets of <style> elements that @import stylesheets are active but loading. We need to trigger a full recalc when such loads are done.
- bool hasActiveLoadingStylesheet = false;
unsigned newStylesheetCount = newStylesheets.size();
- for (auto& sheet : newStylesheets) {
- if (sheet->isLoading())
- hasActiveLoadingStylesheet = true;
- }
- if (m_hadActiveLoadingStylesheet && !hasActiveLoadingStylesheet) {
- m_hadActiveLoadingStylesheet = false;
- return Reconstruct;
- }
- m_hadActiveLoadingStylesheet = hasActiveLoadingStylesheet;
if (updateFlag != OptimizedUpdate)
return Reconstruct;
@@ -281,6 +270,8 @@
if (!is<CSSStyleSheet>(*sheet))
continue;
CSSStyleSheet& styleSheet = downcast<CSSStyleSheet>(*sheet);
+ if (styleSheet.isLoading())
+ continue;
if (styleSheet.disabled())
continue;
if (!styleSheet.length())
Modified: trunk/Source/WebCore/dom/AuthorStyleSheets.h (206166 => 206167)
--- trunk/Source/WebCore/dom/AuthorStyleSheets.h 2016-09-20 20:03:45 UTC (rev 206166)
+++ trunk/Source/WebCore/dom/AuthorStyleSheets.h 2016-09-20 20:05:31 UTC (rev 206167)
@@ -124,7 +124,6 @@
// elements and when it is safe to execute scripts.
int m_pendingStyleSheetCount { 0 };
- bool m_hadActiveLoadingStylesheet { false };
UpdateFlag m_pendingUpdateType { NoUpdate };
ListHashSet<Node*> m_styleSheetCandidateNodes;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
