Changeset 206167 in webkit

Timestamp:

Sep 20, 2016 1:05:31 PM (8 years ago)

Author:

Antti Koivisto

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:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/AuthorStyleSheets.cpp (modified) (2 diffs)
• dom/AuthorStyleSheets.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-20  Antti Koivisto  <antti@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  <krollin@apple.com>
 

trunk/Source/WebCore/dom/AuthorStyleSheets.cpp

@@ -216 +216 @@
     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)
@@ -282 +271 @@
             continue;
         CSSStyleSheet& styleSheet = downcast<CSSStyleSheet>(*sheet);
+        if (styleSheet.isLoading())
+            continue;
         if (styleSheet.disabled())
             continue;

trunk/Source/WebCore/dom/AuthorStyleSheets.h

@@ -125 +125 @@
     int m_pendingStyleSheetCount { 0 };
 
-    bool m_hadActiveLoadingStylesheet { false };
     UpdateFlag m_pendingUpdateType { NoUpdate };