Changeset 106351 in webkit

Timestamp:

Jan 31, 2012 3:04:10 AM (12 years ago)

Author:

rolandsteiner@chromium.org

Message:

<style scoped>: Improve shortcut code for cases where <style scoped> isn't used
​https://bugs.webkit.org/show_bug.cgi?id=77410

Move shortcut from setupScopingElementStack(), do it at the calling sites instead
(where a larger chunk of work can be skipped).

Reviewed by Antti Koivisto.

No new tests. (refactoring)

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::setupScopingElementStack): remove shortcut code
(WebCore::CSSStyleSelector::pushParent): add shortcut code
(WebCore::CSSStyleSelector::matchScopedAuthorRules): factor matching scoped rules out from matchAuthorRules
(WebCore::CSSStyleSelector::matchAuthorRules): add shortcut code

• css/CSSStyleSelector.h:

(CSSStyleSelector): add matchScopedAuthorRules

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-31  Roland Steiner  <rolandsteiner@chromium.org>
+
+        <style scoped>: Improve shortcut code for cases where <style scoped> isn't used
+        https://bugs.webkit.org/show_bug.cgi?id=77410
+
+        Move shortcut from setupScopingElementStack(), do it at the calling sites instead
+        (where a larger chunk of work can be skipped).
+
+        Reviewed by Antti Koivisto.
+
+        No new tests. (refactoring)
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::setupScopingElementStack): remove shortcut code
+        (WebCore::CSSStyleSelector::pushParent): add shortcut code
+        (WebCore::CSSStyleSelector::matchScopedAuthorRules): factor matching scoped rules out from matchAuthorRules
+        (WebCore::CSSStyleSelector::matchAuthorRules): add shortcut code
+        * css/CSSStyleSelector.h:
+        (CSSStyleSelector): add matchScopedAuthorRules
+
 2012-01-31  Pavel Feldman  <pfeldman@google.com>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -499 +499 @@
 void CSSStyleSelector::setupScopingElementStack(const Element* parent)
 {
-    // Shortcut: abort if <style scoped> isn't used anywhere
-    if (m_scopedAuthorStyles.isEmpty()) {
-        ASSERT(!m_scopingElementStackParent);
-        ASSERT(m_scopingElementStack.isEmpty());
-        return;
-    }
+    // The scoping element stack shouldn't be used if <style scoped> isn't used anywhere.
+    ASSERT(!m_scopedAuthorStyles.isEmpty());
+
     m_scopingElementStack.shrink(0);
     for (; parent; parent = parent->parentOrHostElement()) {
@@ -529 +526 @@
 
 #if ENABLE(STYLE_SCOPED)
+    // Shortcut: Don't bother with the scoping element stack if <style scoped> isn't used anywhere.
+    if (m_scopedAuthorStyles.isEmpty()) {
+        ASSERT(!m_scopingElementStackParent);
+        ASSERT(m_scopingElementStack.isEmpty());
+        return;
+    }
+    // In some wacky cases during style resolve we may get invoked for random elements.
+    // Recreate the whole scoping element stack in such cases.
     if (!scopingElementStackIsConsistent(parentsParent)) {
-        // In some wacky cases during style resolve we may get invoked for random elements -
-        // recreate the scoping element stack in such cases.
         setupScopingElementStack(parent);
         return;
     }
+    // Otherwise just push the parent onto the stack.
     RuleSet* ruleSet = scopedRuleSetForElement(parent);
     if (ruleSet)
@@ -825 +829 @@
 }
 
-void CSSStyleSelector::matchAuthorRules(int& firstRuleIndex, int& lastRuleIndex, bool includeEmptyRules)
-{
-    m_matchedRules.clear();
-
-    if (!m_element)
-        return;
-
-    // Match global author rules.
-    collectMatchingRules(m_authorStyle.get(), firstRuleIndex, lastRuleIndex, includeEmptyRules);
-    collectMatchingRulesForRegion(m_authorStyle.get(), firstRuleIndex, lastRuleIndex, includeEmptyRules);
-
+void CSSStyleSelector::matchScopedAuthorRules(int& firstRuleIndex, int& lastRuleIndex, bool includeEmptyRules)
+{
 #if ENABLE(STYLE_SCOPED)
+    if (m_scopedAuthorStyles.isEmpty())
+        return;
+
     // Match scoped author rules by traversing the scoped element stack (rebuild it if it got inconsistent).
     const Element* parent = m_element->parentOrHostElement();
@@ -851 +849 @@
         collectMatchingRulesForRegion(ruleSet, firstRuleIndex, lastRuleIndex, includeEmptyRules);
     }
+#else
+    UNUSED_PARAM(firstRuleIndex);
+    UNUSED_PARAM(lastRuleIndex);
+    UNUSED_PARAM(includeEmptyRules);
 #endif
+}
+
+void CSSStyleSelector::matchAuthorRules(int& firstRuleIndex, int& lastRuleIndex, bool includeEmptyRules)
+{
+    m_matchedRules.clear();
+
+    if (!m_element)
+        return;
+
+    // Match global author rules.
+    collectMatchingRules(m_authorStyle.get(), firstRuleIndex, lastRuleIndex, includeEmptyRules);
+    collectMatchingRulesForRegion(m_authorStyle.get(), firstRuleIndex, lastRuleIndex, includeEmptyRules);
+
+    matchScopedAuthorRules(firstRuleIndex, lastRuleIndex, includeEmptyRules);
 
     sortAndTransferMatchedRules();

trunk/Source/WebCore/css/CSSStyleSelector.h

@@ -281 +281 @@
     void matchRules(RuleSet*, int& firstRuleIndex, int& lastRuleIndex, bool includeEmptyRules);
     void matchAuthorRules(int& firstRuleIndex, int& lastRuleIndex, bool includeEmptyRules);
+    void matchScopedAuthorRules(int& firstRuleIndex, int& lastRuleIndex, bool includeEmptyRules);
     void collectMatchingRules(RuleSet*, int& firstRuleIndex, int& lastRuleIndex, bool includeEmptyRules);
     void collectMatchingRulesForRegion(RuleSet*, int& firstRuleIndex, int& lastRuleIndex, bool includeEmptyRules);