Changeset 214830 in webkit

Timestamp:

Apr 3, 2017 12:08:07 PM (7 years ago)

Author:

Antti Koivisto

Message:

REGRESSION (r207669): FileMaker Pro Help pages do not render correctly
​https://bugs.webkit.org/show_bug.cgi?id=170402
<rdar://problem/31004344>

Reviewed by Simon Fraser.

Source/WebCore:

If a new stylesheet load is started from the load event the document.styleSheets does not
always reflect the already loaded stylesheets.

Test: fast/css/document-stylesheets-dynamic.html

• style/StyleScope.cpp:

(WebCore::Style::Scope::updateActiveStyleSheets):

Remove an old optimization where we would not update active stylesheets if there were pending
(head) stylesheet loads and they had not been updated already.
This is probably not a valuable optimization anymore with the new lazy stylesheet update strategy.

• style/StyleScope.h:

LayoutTests:

• fast/css/document-stylesheets-dynamic-expected.html: Added.
• fast/css/document-stylesheets-dynamic.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/document-stylesheets-dynamic-expected.html (added)
• LayoutTests/fast/css/document-stylesheets-dynamic.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/StyleScope.cpp (modified) (1 diff)
• Source/WebCore/style/StyleScope.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-04-03  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (r207669): FileMaker Pro Help pages do not render correctly
+        https://bugs.webkit.org/show_bug.cgi?id=170402
+        <rdar://problem/31004344>
+
+        Reviewed by Simon Fraser.
+
+        * fast/css/document-stylesheets-dynamic-expected.html: Added.
+        * fast/css/document-stylesheets-dynamic.html: Added.
+
 2017-04-03  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-03  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION (r207669): FileMaker Pro Help pages do not render correctly
+        https://bugs.webkit.org/show_bug.cgi?id=170402
+        <rdar://problem/31004344>
+
+        Reviewed by Simon Fraser.
+
+        If a new stylesheet load is started from the load event the document.styleSheets does not
+        always reflect the already loaded stylesheets.
+
+        Test: fast/css/document-stylesheets-dynamic.html
+
+        * style/StyleScope.cpp:
+        (WebCore::Style::Scope::updateActiveStyleSheets):
+
+            Remove an old optimization where we would not update active stylesheets if there were pending
+            (head) stylesheet loads and they had not been updated already.
+            This is probably not a valuable optimization anymore with the new lazy stylesheet update strategy.
+
+        * style/StyleScope.h:
+
 2017-04-03  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/style/StyleScope.cpp

@@ -444 +444 @@
     }
 
-    // Don't bother updating, since we haven't loaded all our style info yet
-    // and haven't calculated the style resolver for the first time.
-    if (!m_shadowRoot && !m_didUpdateActiveStyleSheets && hasPendingSheetsBeforeBody()) {
-        clearResolver();
-        return;
-    }
-
-    m_didUpdateActiveStyleSheets = true;
-
     Vector<RefPtr<StyleSheet>> activeStyleSheets;
     collectActiveStyleSheets(activeStyleSheets);

trunk/Source/WebCore/style/StyleScope.h

@@ -164 +164 @@
     HashSet<const Element*> m_elementsInBodyWithPendingSheets;
 
-    bool m_didUpdateActiveStyleSheets { false };
-
     std::optional<UpdateType> m_pendingUpdate;
     bool m_hasDescendantWithPendingUpdate { false };