Changeset 145822 in webkit

Timestamp:

Mar 14, 2013 10:01:44 AM (11 years ago)

Author:

robert@webkit.org

Message:

REGRESSION(r145305) Performance: 1.3% mac-release-10.6-webkit-latest/intl2/times/t change after rev 145300
​https://bugs.webkit.org/show_bug.cgi?id=112125

Reviewed by Julien Chaffraix.

When detecting cases where a loaded image may need to move up into the padding created by the row's baseline
we don't need to do anything if the row doesn't have a baseline yet.

• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::layout):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-14  Robert Hogan  <robert@webkit.org>
+
+        REGRESSION(r145305) Performance: 1.3% mac-release-10.6-webkit-latest/intl2/times/t change after rev 145300
+        https://bugs.webkit.org/show_bug.cgi?id=112125
+
+        Reviewed by Julien Chaffraix.
+
+        When detecting cases where a loaded image may need to move up into the padding created by the row's baseline
+        we don't need to do anything if the row doesn't have a baseline yet.
+
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::layout):
+
 2013-03-14  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -252 +252 @@
     // of them wrong. So if our content's intrinsic height has changed push the new content up into the intrinsic padding and relayout so that the rest of
     // table and row layout can use the correct baseline and height for this cell.
-    if (isBaselineAligned() && cellBaselinePosition() > section()->rowBaseline(rowIndex())) {
+    if (isBaselineAligned() && section()->rowBaseline(rowIndex()) && cellBaselinePosition() > section()->rowBaseline(rowIndex())) {
         int newIntrinsicPaddingBefore = max<LayoutUnit>(0, intrinsicPaddingBefore() - max<LayoutUnit>(0, cellBaselinePosition() - oldCellBaseline));
         setIntrinsicPaddingBefore(newIntrinsicPaddingBefore);