Changeset 20980 in webkit

Timestamp:

Apr 20, 2007 5:24:43 PM (17 years ago)

Author:

hyatt

Message:

Bug 13424, firstLineStyle and verticalPositionHint together take
33% of the time on the new tag nesting PLT. Don't waste time even
looking for first-line styles if no stylesheet used them.

Reviewed by beth

• css/CSSGrammar.y:
• dom/Document.cpp: (WebCore::Document::Document):
• dom/Document.h: (WebCore::Document::usesFirstLineRules): (WebCore::Document::setUsesFirstLineRules):
• rendering/RenderObject.cpp: (WebCore::RenderObject::verticalPositionHint): (WebCore::RenderObject::firstLineStyle):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSGrammar.y (modified) (2 diffs)
• dom/Document.cpp (modified) (1 diff)
• dom/Document.h (modified) (2 diffs)
• rendering/RenderObject.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-04-20  David Hyatt  <hyatt@apple.com>
+
+        Bug 13424, firstLineStyle and verticalPositionHint together take
+        33% of the time on the new tag nesting PLT.  Don't waste time even
+        looking for first-line styles if no stylesheet used them.
+
+        Reviewed by beth
+
+        * css/CSSGrammar.y:
+        * dom/Document.cpp:
+        (WebCore::Document::Document):
+        * dom/Document.h:
+        (WebCore::Document::usesFirstLineRules):
+        (WebCore::Document::setUsesFirstLineRules):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::verticalPositionHint):
+        (WebCore::RenderObject::firstLineStyle):
+
 2007-04-20  Peter Kasting  <pkasting@google.com>
 

trunk/WebCore/css/CSSGrammar.y

@@ -852 +852 @@
             if (doc)
                 doc->setUsesSiblingRules(true);
+        } else if (type == CSSSelector::PseudoFirstLine) {
+            CSSParser* p = static_cast<CSSParser*>(parser);
+            if (Document* doc = p->document())
+                doc->setUsesFirstLineRules(true);
         }
     }
@@ -859 +863 @@
         $3.lower();
         $$->m_value = atomicString($3);
-        if ($$->pseudoType() == CSSSelector::PseudoUnknown)
+        CSSSelector::PseudoType type = $$->pseudoType();
+        if (type == CSSSelector::PseudoUnknown)
             $$ = 0;
+        else if (type == CSSSelector::PseudoFirstLine) {
+            CSSParser* p = static_cast<CSSParser*>(parser);
+            if (Document* doc = p->document())
+                doc->setUsesFirstLineRules(true);
+        }
     }
     // used by :lang

trunk/WebCore/dom/Document.cpp

@@ -326 +326 @@
     m_usesDescendantRules = false;
     m_usesSiblingRules = false;
+    m_usesFirstLineRules = false;
 
     m_styleSelector = new CSSStyleSelector(this, m_usersheet, m_styleSheets.get(), !inCompatMode());

trunk/WebCore/dom/Document.h

@@ -281 +281 @@
     bool usesSiblingRules() const { return m_usesSiblingRules; }
     void setUsesSiblingRules(bool b) { m_usesSiblingRules = b; }
+    bool usesFirstLineRules() const { return m_usesFirstLineRules; }
+    void setUsesFirstLineRules(bool b) { m_usesFirstLineRules = b; }
 
     // Machinery for saving and restoring state when you leave and then go back to a page.
@@ -704 +706 @@
     bool m_usesDescendantRules;
     bool m_usesSiblingRules;
-    
+    bool m_usesFirstLineRules;
+
     String m_title;
     bool m_titleSetExplicitly;

trunk/WebCore/rendering/RenderObject.cpp

@@ -2614 +2614 @@
 short RenderObject::verticalPositionHint(bool firstLine) const
 {
+    if (firstLine) // We're only really a first-line style if the document actually uses first-line rules.
+        firstLine = document()->usesFirstLineRules();
     short vpos = m_verticalPosition;
     if (m_verticalPosition == PositionUndefined || firstLine) {
@@ -2778 +2780 @@
 RenderStyle* RenderObject::firstLineStyle() const
 {
+    if (!document()->usesFirstLineRules())
+        return m_style;
+
     RenderStyle* s = m_style;
     const RenderObject* obj = isText() ? parent() : this;