Changeset 93218 in webkit

Timestamp:

Aug 17, 2011, 10:45:40 AM (15 years ago)

Author:

macpherson@chromium.org

Message:

Only set m_fontDirty if TextSizeAdjust is actually changed.
​https://bugs.webkit.org/show_bug.cgi?id=66022

Reviewed by Darin Adler.

No new tests. Refactoring only.

Reduces instances where the font information is dirtied to save recalculation where it is not necessary.

• css/CSSStyleSelector.cpp:

(WebCore::CSSStyleSelector::applyProperty):
Call new setTextSizeAdjust function.

• css/CSSStyleSelector.h:

(WebCore::CSSStyleSelector::setTextSizeAdjust):
Add wrapper for RenderStyle::setTextSizeAdjust() that automatically updates m_fontDirty.

• rendering/style/RenderStyle.h:

(WebCore::RenderStyle::setTextSizeAdjust):
Make setTextSizeAdjust return true if the unlderlying value was changed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (1 diff)
• css/CSSStyleSelector.h (modified) (1 diff)
• rendering/style/RenderStyle.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-17  Luke Macpherson   <macpherson@chromium.org>
+
+        Only set m_fontDirty if TextSizeAdjust is actually changed.
+        https://bugs.webkit.org/show_bug.cgi?id=66022
+
+        Reviewed by Darin Adler.
+
+        No new tests. Refactoring only.
+
+        Reduces instances where the font information is dirtied to save recalculation where it is not necessary.
+
+        * css/CSSStyleSelector.cpp:
+        (WebCore::CSSStyleSelector::applyProperty):
+        Call new setTextSizeAdjust function.
+        * css/CSSStyleSelector.h:
+        (WebCore::CSSStyleSelector::setTextSizeAdjust):
+        Add wrapper for RenderStyle::setTextSizeAdjust() that automatically updates m_fontDirty.
+        * rendering/style/RenderStyle.h:
+        (WebCore::RenderStyle::setTextSizeAdjust):
+        Make setTextSizeAdjust return true if the unlderlying value was changed.
+
 2011-08-17  Kenichi Ishibashi  <bashi@chromium.org>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -4748 +4748 @@
     case CSSPropertyWebkitTextSizeAdjust: {
         HANDLE_INHERIT_AND_INITIAL(textSizeAdjust, TextSizeAdjust)
-        if (!primitiveValue || !primitiveValue->getIdent()) return;
-        m_style->setTextSizeAdjust(primitiveValue->getIdent() == CSSValueAuto);
-        m_fontDirty = true;
+        if (!primitiveValue || !primitiveValue->getIdent())
+            return;
+        setTextSizeAdjust(primitiveValue->getIdent() == CSSValueAuto);
         return;
     }

trunk/Source/WebCore/css/CSSStyleSelector.h

@@ -119 +119 @@
         void setZoom(float f) { m_fontDirty |= style()->setZoom(f); }
         void setEffectiveZoom(float f) { m_fontDirty |= style()->setEffectiveZoom(f); }
+        void setTextSizeAdjust(bool b) { m_fontDirty |= style()->setTextSizeAdjust(b); }
 
     private:

trunk/Source/WebCore/rendering/style/RenderStyle.h

@@ -1150 +1150 @@
     void setLineBoxContain(LineBoxContain c) { SET_VAR(rareInheritedData, m_lineBoxContain, c); }
     void setLineClamp(LineClampValue c) { SET_VAR(rareNonInheritedData, lineClamp, c); }
-    void setTextSizeAdjust(bool b) { SET_VAR(rareInheritedData, textSizeAdjust, b); }
+    bool setTextSizeAdjust(bool);
     void setTextSecurity(ETextSecurity aTextSecurity) { SET_VAR(rareInheritedData, textSecurity, aTextSecurity); }
 
@@ -1442 +1442 @@
 }
 
+inline bool RenderStyle::setTextSizeAdjust(bool b)
+{
+    if (compareEqual(rareInheritedData->textSizeAdjust, b))
+        return false;
+    rareInheritedData.access()->textSizeAdjust = b;
+    return true;
+}
+
 } // namespace WebCore