Changeset 207717 in webkit

Timestamp:

Oct 22, 2016 2:27:53 PM (7 years ago)

Author:

Antti Koivisto

Message:

REGRESSION(r207669): Dromaeo/jslib-style-jquery.html regressed >20%
​https://bugs.webkit.org/show_bug.cgi?id=163851

Reviewed by Darin Adler.

The test calls Scope::flushPendingUpdate a lot and nothing ever happens there.

Add a separate invalidity bit for descendant scopes and inline the fast path.

• style/StyleScope.cpp:

(WebCore::Style::Scope::flushPendingSelfUpdate):
(WebCore::Style::Scope::flushPendingDescendantUpdates):
(WebCore::Style::Scope::scheduleUpdate):
(WebCore::Style::Scope::flushPendingUpdate): Deleted.

• style/StyleScope.h:

(WebCore::Style::Scope::hasPendingUpdate):
(WebCore::Style::Scope::flushPendingUpdate):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• style/StyleScope.cpp (modified) (2 diffs)
• style/StyleScope.h (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-22  Antti Koivisto  <antti@apple.com>
+
+        REGRESSION(r207669): Dromaeo/jslib-style-jquery.html regressed >20%
+        https://bugs.webkit.org/show_bug.cgi?id=163851
+
+        Reviewed by Darin Adler.
+
+        The test calls Scope::flushPendingUpdate a lot and nothing ever happens there.
+
+        Add a separate invalidity bit for descendant scopes and inline the fast path.
+
+        * style/StyleScope.cpp:
+        (WebCore::Style::Scope::flushPendingSelfUpdate):
+        (WebCore::Style::Scope::flushPendingDescendantUpdates):
+        (WebCore::Style::Scope::scheduleUpdate):
+        (WebCore::Style::Scope::flushPendingUpdate): Deleted.
+        * style/StyleScope.h:
+        (WebCore::Style::Scope::hasPendingUpdate):
+        (WebCore::Style::Scope::flushPendingUpdate):
+
 2016-10-22  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/style/StyleScope.cpp

@@ -468 +468 @@
 }
 
-void Scope::flushPendingUpdate()
-{
-    if (!m_shadowRoot) {
-        for (auto* descendantShadowRoot : m_document.inDocumentShadowRoots())
-            descendantShadowRoot->styleScope().flushPendingUpdate();
-    }
-    if (!m_pendingUpdate)
-        return;
+void Scope::flushPendingSelfUpdate()
+{
+    ASSERT(m_pendingUpdate);
+
     auto updateType = *m_pendingUpdate;
 
     clearPendingUpdate();
-
     updateActiveStyleSheets(updateType);
+}
+
+void Scope::flushPendingDescendantUpdates()
+{
+    ASSERT(m_hasDescendantWithPendingUpdate);
+    ASSERT(!m_shadowRoot);
+    for (auto* descendantShadowRoot : m_document.inDocumentShadowRoots())
+        descendantShadowRoot->styleScope().flushPendingUpdate();
+    m_hasDescendantWithPendingUpdate = false;
 }
 
@@ -491 +495 @@
 void Scope::scheduleUpdate(UpdateType update)
 {
-    if (!m_pendingUpdate || *m_pendingUpdate < update)
+    if (!m_pendingUpdate || *m_pendingUpdate < update) {
         m_pendingUpdate = update;
+        if (m_shadowRoot)
+            m_document.styleScope().m_hasDescendantWithPendingUpdate = true;
+    }
 
     if (m_pendingUpdateTimer.isActive())

trunk/Source/WebCore/style/StyleScope.h

@@ -93 +93 @@
     WEBCORE_EXPORT void didChangeStyleSheetEnvironment();
 
-    bool hasPendingUpdate() const { return !!m_pendingUpdate; }
-    WEBCORE_EXPORT void flushPendingUpdate();
+    bool hasPendingUpdate() const { return m_pendingUpdate || m_hasDescendantWithPendingUpdate; }
+    void flushPendingUpdate();
 
     StyleResolver& resolver();
@@ -108 +108 @@
     void updateActiveStyleSheets(UpdateType);
     void scheduleUpdate(UpdateType);
+
+    WEBCORE_EXPORT void flushPendingSelfUpdate();
+    WEBCORE_EXPORT void flushPendingDescendantUpdates();
 
     void collectActiveStyleSheets(Vector<RefPtr<StyleSheet>>&);
@@ -142 +145 @@
 
     Optional<UpdateType> m_pendingUpdate;
+    bool m_hasDescendantWithPendingUpdate { false };
 
     ListHashSet<Node*> m_styleSheetCandidateNodes;
@@ -151 +155 @@
 };
 
+inline void Scope::flushPendingUpdate()
+{
+    if (m_hasDescendantWithPendingUpdate)
+        flushPendingDescendantUpdates();
+    if (m_pendingUpdate)
+        flushPendingSelfUpdate();
+}
+
 }
 }