Changeset 102555 in webkit

Timestamp:

Dec 11, 2011 7:43:10 PM (12 years ago)

Author:

kling@webkit.org

Message:

Micro-optimize CSSStyleSelector::findSiblingForStyleSharing().
<​http://webkit.org/b/74261>

Reviewed by Antti Koivisto.

Move the isStyledElement() check from canShareStyleWithElement() into the
loop in findSiblingForStyleSharing(), and tighten up the argument/return
types to StyledElement* as appropriate.

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::canShareStyleWithElement):
(WebCore::CSSStyleSelector::findSiblingForStyleSharing):
(WebCore::CSSStyleSelector::locateSharedStyle):

• css/CSSStyleSelector.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (5 diffs)
• css/CSSStyleSelector.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-11  Andreas Kling  <kling@webkit.org>
+
+        Micro-optimize CSSStyleSelector::findSiblingForStyleSharing().
+        <http://webkit.org/b/74261>
+
+        Reviewed by Antti Koivisto.
+
+        Move the isStyledElement() check from canShareStyleWithElement() into the
+        loop in findSiblingForStyleSharing(), and tighten up the argument/return
+        types to StyledElement* as appropriate.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::canShareStyleWithElement):
+        (WebCore::CSSStyleSelector::findSiblingForStyleSharing):
+        (WebCore::CSSStyleSelector::locateSharedStyle):
+        * css/CSSStyleSelector.h:
+
 2011-12-11  Shinya Kawanaka  <shinyak@google.com>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -993 +993 @@
 }
 
-bool CSSStyleSelector::canShareStyleWithElement(Node* node) const
-{
-    if (!node->isStyledElement())
-        return false;
-
-    StyledElement* element = static_cast<StyledElement*>(node);
+bool CSSStyleSelector::canShareStyleWithElement(StyledElement* element) const
+{
     RenderStyle* style = element->renderStyle();
 
@@ -1081 +1077 @@
 }
 
-inline Node* CSSStyleSelector::findSiblingForStyleSharing(Node* node, unsigned& count) const
+inline StyledElement* CSSStyleSelector::findSiblingForStyleSharing(Node* node, unsigned& count) const
 {
     for (; node; node = node->previousSibling()) {
-        if (!node->isElementNode())
+        if (!node->isStyledElement())
             continue;
-        if (canShareStyleWithElement(node))
+        if (canShareStyleWithElement(static_cast<StyledElement*>(node)))
             break;
         if (count++ == cStyleSearchThreshold)
             return 0;
     }
-    return node;
+    return static_cast<StyledElement*>(node);
 }
 
@@ -1118 +1114 @@
     unsigned count = 0;
     unsigned visitedNodeCount = 0;
-    Node* shareNode = 0;
+    StyledElement* shareElement = 0;
     Node* cousinList = m_styledElement->previousSibling();
     while (cousinList) {
-        shareNode = findSiblingForStyleSharing(cousinList, count);
-        if (shareNode)
+        shareElement = findSiblingForStyleSharing(cousinList, count);
+        if (shareElement)
             break;
         cousinList = locateCousinList(cousinList->parentElement(), visitedNodeCount);
@@ -1128 +1124 @@
 
     // If we have exhausted all our budget or our cousins.
-    if (!shareNode)
+    if (!shareElement)
         return 0;
 
@@ -1140 +1136 @@
     if (parentStylePreventsSharing(m_parentStyle))
         return 0;
-    return shareNode->renderStyle();
+    return shareElement->renderStyle();
 }
 

trunk/Source/WebCore/css/CSSStyleSelector.h

@@ -135 +135 @@
     bool matchesRuleSet(RuleSet*);
     Node* locateCousinList(Element* parent, unsigned& visitedNodeCount) const;
-    Node* findSiblingForStyleSharing(Node*, unsigned& count) const;
-    bool canShareStyleWithElement(Node*) const;
+    StyledElement* findSiblingForStyleSharing(Node*, unsigned& count) const;
+    bool canShareStyleWithElement(StyledElement*) const;
 
     PassRefPtr<RenderStyle> styleForKeyframe(const RenderStyle*, const WebKitCSSKeyframeRule*, KeyframeValue&);