Changeset 130710 in webkit

Timestamp:

Oct 8, 2012 6:39:20 PM (12 years ago)

Author:

eric@webkit.org

Message:

Inline logicalHeightForRowSizing to shave another 2-3% off robohornet's resizecol.html
​https://bugs.webkit.org/show_bug.cgi?id=98703

Reviewed by Emil A Eklund.

This is very small potatoes. There are much bigger wins for table layout yet, but
this was an easy win.

This function should probably be converted to use int's only, as table cells are pixel-sized
according to our subpixel-experts.

Also, I suspect there should be ways to early return with less-math in the common cases, but
I've saved such for a later patch.

Note that I changed from using paddingBefore/paddingAfter (which include the instrinsic padding)
to calling computedCSSPaddingBefore/computedCSSPaddingAfter directly as well.

This single function is about 11% of total time for robohornet's resizecol.

• rendering/RenderTableCell.cpp:
• rendering/RenderTableCell.h:

(WebCore::RenderTableCell::logicalHeightForRowSizing):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderTableCell.cpp (modified) (1 diff)
• rendering/RenderTableCell.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-10-08  Eric Seidel  <eric@webkit.org>
+
+        Inline logicalHeightForRowSizing to shave another 2-3% off robohornet's resizecol.html
+        https://bugs.webkit.org/show_bug.cgi?id=98703
+
+        Reviewed by Emil A Eklund.
+
+        This is very small potatoes.  There are much bigger wins for table layout yet, but
+        this was an easy win.
+
+        This function should probably be converted to use int's only, as table cells are pixel-sized
+        according to our subpixel-experts.
+
+        Also, I suspect there should be ways to early return with less-math in the common cases, but
+        I've saved such for a later patch.
+
+        Note that I changed from using paddingBefore/paddingAfter (which include the instrinsic padding)
+        to calling computedCSSPaddingBefore/computedCSSPaddingAfter directly as well.
+
+        This single function is about 11% of total time for robohornet's resizecol.
+
+        * rendering/RenderTableCell.cpp:
+        * rendering/RenderTableCell.h:
+        (WebCore::RenderTableCell::logicalHeightForRowSizing):
+
 2012-10-08  Alec Flett  <alecflett@chromium.org>
 

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -126 +126 @@
 }
 
-LayoutUnit RenderTableCell::logicalHeightForRowSizing() const
-{
-    LayoutUnit adjustedLogicalHeight = logicalHeight() - (intrinsicPaddingBefore() + intrinsicPaddingAfter());
-
-    LayoutUnit styleLogicalHeight = valueForLength(style()->logicalHeight(), 0, view());
-    if (document()->inQuirksMode() || style()->boxSizing() == BORDER_BOX) {
-        // Explicit heights use the border box in quirks mode.
-        // Don't adjust height.
-    } else {
-        // In strict mode, box-sizing: content-box do the right
-        // thing and actually add in the border and padding.
-        LayoutUnit adjustedPaddingBefore = paddingBefore() - intrinsicPaddingBefore();
-        LayoutUnit adjustedPaddingAfter = paddingAfter() - intrinsicPaddingAfter();
-        styleLogicalHeight += adjustedPaddingBefore + adjustedPaddingAfter + borderBefore() + borderAfter();
-    }
-
-    return max(styleLogicalHeight, adjustedLogicalHeight);
-}
-
 Length RenderTableCell::logicalWidthFromColumns(RenderTableCol* firstColForThisCell, Length widthFromStyle) const
 {

trunk/Source/WebCore/rendering/RenderTableCell.h

@@ -91 +91 @@
     }
 
-    LayoutUnit logicalHeightForRowSizing() const;
+    LayoutUnit logicalHeightForRowSizing() const
+    {
+        // FIXME: This function does too much work, and is very hot during table layout!
+        LayoutUnit adjustedLogicalHeight = logicalHeight() - (intrinsicPaddingBefore() + intrinsicPaddingAfter());
+        LayoutUnit styleLogicalHeight = valueForLength(style()->logicalHeight(), 0, view());
+        // In strict mode, box-sizing: content-box do the right thing and actually add in the border and padding.
+        // Call computedCSSPadding* directly to avoid including implicitPadding.
+        if (!document()->inQuirksMode() && style()->boxSizing() != BORDER_BOX)
+            styleLogicalHeight += computedCSSPaddingBefore() + computedCSSPaddingAfter() + borderBefore() + borderAfter();
+        return max(styleLogicalHeight, adjustedLogicalHeight);
+    }
 
     virtual void computePreferredLogicalWidths();