Changeset 150258 in webkit

Timestamp:

May 17, 2013 8:11:10 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Improve -webkit-text-underline-position memory usage.
​https://bugs.webkit.org/show_bug.cgi?id=116108

Patch by Lamarque V. Souza <​Lamarque.Souza@basyskom.com> on 2013-05-17
Reviewed by Benjamin Poulain.

Remove m_maxLogicalTop private variable from RootInlineBox to reduce
the overall memory used to render RootInlineBoxes (eight bytes per RootInlineBox
instance in a 64-bit machine). RootInline::maxLogicalTop() now computes
the maxLogicalTop value everytime it is called. In a typical page
computeMaxLogicalTop is called less than 10 times for each
InlineTextBox that uses -webkit-text-underline-position. That is a small
price users of -webkit-text-underline-position will pay so that
everybody can benefit from the memory reduction in RootInlineBox.

No new tests, no change in behavior.

• rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::computeMaxLogicalTop): Make it const.

• rendering/InlineFlowBox.h:
• rendering/RootInlineBox.cpp:

(WebCore::RootInlineBox::RootInlineBox): Remove m_maxLogicalTop.
(WebCore::RootInlineBox::alignBoxesInBlockDirection): Remove
computeMaxLogicalTop call and obsolete comment.
(WebCore):
(WebCore::RootInlineBox::maxLogicalTop): Compute maxLogicalTop before
returning its value.

• rendering/RootInlineBox.h:

(RootInlineBox):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineFlowBox.cpp (modified) (1 diff)
• rendering/InlineFlowBox.h (modified) (1 diff)
• rendering/RootInlineBox.cpp (modified) (3 diffs)
• rendering/RootInlineBox.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-17  Lamarque V. Souza  <Lamarque.Souza@basyskom.com>
+
+        Improve -webkit-text-underline-position memory usage.
+        https://bugs.webkit.org/show_bug.cgi?id=116108
+
+        Reviewed by Benjamin Poulain.
+
+        Remove m_maxLogicalTop private variable from RootInlineBox to reduce
+        the overall memory used to render RootInlineBoxes (eight bytes per RootInlineBox
+        instance in a 64-bit machine). RootInline::maxLogicalTop() now computes
+        the maxLogicalTop value everytime it is called. In a typical page
+        computeMaxLogicalTop is called less than 10 times for each
+        InlineTextBox that uses -webkit-text-underline-position. That is a small
+        price users of -webkit-text-underline-position will pay so that
+        everybody can benefit from the memory reduction in RootInlineBox.
+
+        No new tests, no change in behavior.
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::computeMaxLogicalTop): Make it const.
+        * rendering/InlineFlowBox.h:
+        * rendering/RootInlineBox.cpp:
+        (WebCore::RootInlineBox::RootInlineBox): Remove m_maxLogicalTop.
+        (WebCore::RootInlineBox::alignBoxesInBlockDirection): Remove
+        computeMaxLogicalTop call and obsolete comment.
+        (WebCore):
+        (WebCore::RootInlineBox::maxLogicalTop): Compute maxLogicalTop before
+        returning its value.
+        * rendering/RootInlineBox.h:
+        (RootInlineBox):
+
 2013-05-17  Alexis Menard  <alexis@webkit.org>
 

trunk/Source/WebCore/rendering/InlineFlowBox.cpp

@@ -748 +748 @@
 
 #if ENABLE(CSS3_TEXT)
-void InlineFlowBox::computeMaxLogicalTop(float& maxLogicalTop)
+void InlineFlowBox::computeMaxLogicalTop(float& maxLogicalTop) const
 {
     for (InlineBox* curr = firstChild(); curr; curr = curr->nextOnLine()) {

trunk/Source/WebCore/rendering/InlineFlowBox.h

@@ -311 +311 @@
     // Maximum logicalTop among all children of an InlineFlowBox. Used to
     // calculate the offset for TextUnderlinePositionUnder.
-    void computeMaxLogicalTop(float& maxLogicalTop);
+    void computeMaxLogicalTop(float& maxLogicalTop) const;
 #endif // CSS3_TEXT
 private:

trunk/Source/WebCore/rendering/RootInlineBox.cpp

@@ -55 +55 @@
     , m_lineTopWithLeading(0)
     , m_lineBottomWithLeading(0)
-#if ENABLE(CSS3_TEXT)
-    , m_maxLogicalTop(0)
-#endif // CSS3_TEXT
 {
     setIsHorizontal(block->isHorizontalWritingMode());
@@ -284 +281 @@
     if (isSVGRootInlineBox())
         return 0;
-
-    // FIXME: figure out how to call computeMaxLogicalTop() when SVG is enabled.
 #endif
 
@@ -338 +333 @@
     }
 
+    return heightOfBlock + maxHeight;
+}
+
 #if ENABLE(CSS3_TEXT)
-    m_maxLogicalTop = 0;
-    computeMaxLogicalTop(m_maxLogicalTop);
+float RootInlineBox::maxLogicalTop() const
+{
+    float maxLogicalTop = 0;
+    computeMaxLogicalTop(maxLogicalTop);
+    return maxLogicalTop;
+}
 #endif // CSS3_TEXT
-
-    return heightOfBlock + maxHeight;
-}
 
 LayoutUnit RootInlineBox::beforeAnnotationsAdjustment() const

trunk/Source/WebCore/rendering/RootInlineBox.h

@@ -191 +191 @@
 #if ENABLE(CSS3_TEXT)
     // Used to calculate the underline offset for TextUnderlinePositionUnder.
-    float maxLogicalTop() const { return m_maxLogicalTop; }
+    float maxLogicalTop() const;
 #endif // CSS3_TEXT
 
@@ -227 +227 @@
     LayoutUnit m_lineTopWithLeading;
     LayoutUnit m_lineBottomWithLeading;
-
-#if ENABLE(CSS3_TEXT)
-    // Maximum logicalTop among all children of an InlineFlowBox. Used to
-    // calculate the offset for TextUnderlinePositionUnder.
-    float m_maxLogicalTop;
-#endif // CSS3_TEXT
 
     struct LineFragmentationData {