Changeset 228729 in webkit

Timestamp:

Feb 19, 2018 10:09:13 PM (6 years ago)

Author:

Antti Koivisto

Message:

Use selector filter when invalidating descendants
​https://bugs.webkit.org/show_bug.cgi?id=182839
<rdar://problem/37581072>

Reviewed by Zalan Bujtas.

We can make descendant invalidation faster by enabling filtering.

• css/SelectorFilter.cpp:

(WebCore::SelectorFilter::initializeParentStack):

Traverse and reverse the ancestor chain, and push it.

(WebCore::SelectorFilter::pushParent):
(WebCore::SelectorFilter::pushParentInitializingIfNeeded):

Add a version of pushParent that can initialize the stack.

(WebCore::SelectorFilter::popParent):
(WebCore::SelectorFilter::popParentsUntil):

Pop until a given parent element.

(WebCore::SelectorFilter::pushParentStackFrame): Deleted.
(WebCore::SelectorFilter::popParentStackFrame): Deleted.

These were the same as push/popParent.

• css/SelectorFilter.h:

(WebCore::SelectorFilter::popParent): Deleted.

• style/StyleInvalidator.cpp:

(WebCore::Style::Invalidator::invalidateStyleForDescendants):

Use pushParentInitializingIfNeeded.

(WebCore::Style::Invalidator::invalidateStyleWithMatchElement):

Use selector filter when doing descendant tree invalidation.
Make sure to pop it until the parent when reusing.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/SelectorFilter.cpp (modified) (3 diffs)
• css/SelectorFilter.h (modified) (2 diffs)
• style/StyleInvalidator.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-19  Antti Koivisto  <antti@apple.com>
+
+        Use selector filter when invalidating descendants
+        https://bugs.webkit.org/show_bug.cgi?id=182839
+        <rdar://problem/37581072>
+
+        Reviewed by Zalan Bujtas.
+
+        We can make descendant invalidation faster by enabling filtering.
+
+        * css/SelectorFilter.cpp:
+        (WebCore::SelectorFilter::initializeParentStack):
+
+            Traverse and reverse the ancestor chain, and push it.
+
+        (WebCore::SelectorFilter::pushParent):
+        (WebCore::SelectorFilter::pushParentInitializingIfNeeded):
+
+            Add a version of pushParent that can initialize the stack.
+
+        (WebCore::SelectorFilter::popParent):
+        (WebCore::SelectorFilter::popParentsUntil):
+
+            Pop until a given parent element.
+
+        (WebCore::SelectorFilter::pushParentStackFrame): Deleted.
+        (WebCore::SelectorFilter::popParentStackFrame): Deleted.
+
+            These were the same as push/popParent.
+
+        * css/SelectorFilter.h:
+        (WebCore::SelectorFilter::popParent): Deleted.
+        * style/StyleInvalidator.cpp:
+        (WebCore::Style::Invalidator::invalidateStyleForDescendants):
+
+            Use pushParentInitializingIfNeeded.
+
+        (WebCore::Style::Invalidator::invalidateStyleWithMatchElement):
+
+            Use selector filter when doing descendant tree invalidation.
+            Make sure to pop it until the parent when reusing.
+
 2018-02-19  Fujii Hironori  <Hironori.Fujii@sony.com>
 

trunk/Source/WebCore/css/SelectorFilter.cpp

@@ -64 +64 @@
 }
 
-void SelectorFilter::pushParentStackFrame(Element* parent)
+void SelectorFilter::initializeParentStack(Element& parent)
+{
+    Vector<Element*, 20> ancestors;
+    for (auto* ancestor = &parent; ancestor; ancestor = ancestor->parentElement())
+        ancestors.append(ancestor);
+    for (unsigned i = ancestors.size(); i--;)
+        pushParent(ancestors[i]);
+}
+
+void SelectorFilter::pushParent(Element* parent)
 {
     ASSERT(m_parentStack.isEmpty() || m_parentStack.last().element == parent->parentElement());
@@ -78 +87 @@
 }
 
-void SelectorFilter::popParentStackFrame()
+void SelectorFilter::pushParentInitializingIfNeeded(Element& parent)
+{
+    if (UNLIKELY(m_parentStack.isEmpty())) {
+        initializeParentStack(parent);
+        return;
+    }
+    pushParent(&parent);
+}
+
+void SelectorFilter::popParent()
 {
     ASSERT(!m_parentStack.isEmpty());
@@ -92 +110 @@
 }
 
-void SelectorFilter::pushParent(Element* parent)
-{
-    pushParentStackFrame(parent);
+void SelectorFilter::popParentsUntil(Element* parent)
+{
+    while (!m_parentStack.isEmpty()) {
+        if (parent && m_parentStack.last().element == parent)
+            return;
+        popParent();
+    }
 }
 

trunk/Source/WebCore/css/SelectorFilter.h

@@ -40 +40 @@
 class SelectorFilter {
 public:
-    void pushParentStackFrame(Element* parent);
-    void popParentStackFrame();
-
     void pushParent(Element* parent);
-    void popParent() { popParentStackFrame(); }
+    void pushParentInitializingIfNeeded(Element& parent);
+    void popParent();
+    void popParentsUntil(Element* parent);
     bool parentStackIsEmpty() const { return m_parentStack.isEmpty(); }
     bool parentStackIsConsistent(const ContainerNode* parentNode) const;
@@ -53 +52 @@
 
 private:
+    void initializeParentStack(Element& parent);
+
     struct ParentStackFrame {
         ParentStackFrame() : element(0) { }

trunk/Source/WebCore/style/StyleInvalidator.cpp

@@ -159 +159 @@
                 parentStack.append(parent);
                 if (filter)
-                    filter->pushParent(parent);
+                    filter->pushParentInitializingIfNeeded(*parent);
             } else {
                 while (parentStack.last() != parent) {
@@ -224 +224 @@
     }
     case MatchElement::Ancestor: {
-        invalidateStyleForDescendants(element, nullptr);
+        SelectorFilter filter;
+        invalidateStyleForDescendants(element, &filter);
         break;
     }
@@ -248 +249 @@
         }
         break;
-    case MatchElement::AncestorSibling:
-        for (auto* sibling = element.nextElementSibling(); sibling; sibling = sibling->nextElementSibling())
-            invalidateStyleForDescendants(*sibling, nullptr);
-        break;
+    case MatchElement::AncestorSibling: {
+        SelectorFilter filter;
+        for (auto* sibling = element.nextElementSibling(); sibling; sibling = sibling->nextElementSibling()) {
+            filter.popParentsUntil(element.parentElement());
+            invalidateStyleForDescendants(*sibling, &filter);
+        }
+        break;
+    }
     case MatchElement::Host:
         // FIXME: Handle this here as well.