Changeset 225485 in webkit

Timestamp:

Dec 4, 2017 12:31:35 PM (6 years ago)

Author:

Antti Koivisto

Message:

Enable selector filtering for ::before and ::after pseudo element resolution
​https://bugs.webkit.org/show_bug.cgi?id=180364

Reviewed by Ryosuke Niwa.

Since these pseudo elements are now resolved by TreeResolver we can use selector filter for them.

This is 10%+ progression in StyleBench pseudo element subtest.

• css/StyleResolver.cpp:

(WebCore::StyleResolver::pseudoStyleForElement):

• css/StyleResolver.h:
• style/StyleTreeResolver.cpp:

(WebCore::Style::TreeResolver::resolvePseudoStyle):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/StyleResolver.cpp (modified) (1 diff)
• css/StyleResolver.h (modified) (1 diff)
• style/StyleTreeResolver.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-12-04  Antti Koivisto  <antti@apple.com>
+
+        Enable selector filtering for ::before and ::after pseudo element resolution
+        https://bugs.webkit.org/show_bug.cgi?id=180364
+
+        Reviewed by Ryosuke Niwa.
+
+        Since these pseudo elements are now resolved by TreeResolver we can use selector filter for them.
+
+        This is 10%+ progression in StyleBench pseudo element subtest.
+
+        * css/StyleResolver.cpp:
+        (WebCore::StyleResolver::pseudoStyleForElement):
+        * css/StyleResolver.h:
+        * style/StyleTreeResolver.cpp:
+        (WebCore::Style::TreeResolver::resolvePseudoStyle):
+
 2017-12-04  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebCore/css/StyleResolver.cpp

@@ -553 +553 @@
 }
 
-std::unique_ptr<RenderStyle> StyleResolver::pseudoStyleForElement(const Element& element, const PseudoStyleRequest& pseudoStyleRequest, const RenderStyle& parentStyle)
-{
-    m_state = State(element, &parentStyle);
+std::unique_ptr<RenderStyle> StyleResolver::pseudoStyleForElement(const Element& element, const PseudoStyleRequest& pseudoStyleRequest, const RenderStyle& parentStyle, const SelectorFilter* selectorFilter)
+{
+    m_state = State(element, &parentStyle, m_overrideDocumentElementStyle, selectorFilter);
 
     State& state = m_state;

trunk/Source/WebCore/css/StyleResolver.h

@@ -134 +134 @@
     void keyframeStylesForAnimation(const Element&, const RenderStyle*, KeyframeList&);
 
-    std::unique_ptr<RenderStyle> pseudoStyleForElement(const Element&, const PseudoStyleRequest&, const RenderStyle& parentStyle);
+    std::unique_ptr<RenderStyle> pseudoStyleForElement(const Element&, const PseudoStyleRequest&, const RenderStyle& parentStyle, const SelectorFilter* = nullptr);
 
     std::unique_ptr<RenderStyle> styleForPage(int pageIndex);

trunk/Source/WebCore/style/StyleTreeResolver.cpp

@@ -234 +234 @@
         return { };
 
-    auto pseudoStyle = scope().styleResolver.pseudoStyleForElement(element, { pseudoId }, *elementUpdate.style);
+    auto pseudoStyle = scope().styleResolver.pseudoStyleForElement(element, { pseudoId }, *elementUpdate.style, &scope().selectorFilter);
     if (!pseudoStyle)
         return { };