Changeset 205384 in webkit

Timestamp:

Sep 2, 2016 4:35:13 PM (8 years ago)

Author:

Alan Bujtas

Message:

ASSERT_NOT_REACHED() is touched in WebCore::valueForLength
​https://bugs.webkit.org/show_bug.cgi?id=123337
<rdar://problem/27684121>

Reviewed by Simon Fraser.

Source/WebCore:

Do not try to use unspecified height value while resolving logical height for table row.

Test: fast/table/assert-on-non-resolvable-row-dimension.html

• rendering/RenderTableCell.h:

(WebCore::RenderTableCell::logicalHeightForRowSizing):

LayoutTests:

• fast/table/assert-on-non-resolvable-row-dimension-expected.txt: Added.
• fast/table/assert-on-non-resolvable-row-dimension.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/table/assert-on-non-resolvable-row-dimension-expected.txt (added)
• LayoutTests/fast/table/assert-on-non-resolvable-row-dimension.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderTableCell.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-09-02  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERT_NOT_REACHED() is touched in WebCore::valueForLength
+        https://bugs.webkit.org/show_bug.cgi?id=123337
+        <rdar://problem/27684121>
+
+        Reviewed by Simon Fraser.
+
+        * fast/table/assert-on-non-resolvable-row-dimension-expected.txt: Added.
+        * fast/table/assert-on-non-resolvable-row-dimension.html: Added.
+
 2016-09-02  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-02  Zalan Bujtas  <zalan@apple.com>
+
+        ASSERT_NOT_REACHED() is touched in WebCore::valueForLength
+        https://bugs.webkit.org/show_bug.cgi?id=123337
+        <rdar://problem/27684121>
+
+        Reviewed by Simon Fraser.
+
+        Do not try to use unspecified height value while resolving logical height for table row.
+
+        Test: fast/table/assert-on-non-resolvable-row-dimension.html
+
+        * rendering/RenderTableCell.h:
+        (WebCore::RenderTableCell::logicalHeightForRowSizing):
+
 2016-09-02  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/rendering/RenderTableCell.h

@@ -287 +287 @@
     // FIXME: This function does too much work, and is very hot during table layout!
     LayoutUnit adjustedLogicalHeight = logicalHeight() - (intrinsicPaddingBefore() + intrinsicPaddingAfter());
+    if (!style().logicalHeight().isSpecified())
+        return adjustedLogicalHeight;
     LayoutUnit styleLogicalHeight = valueForLength(style().logicalHeight(), 0);
     // In strict mode, box-sizing: content-box do the right thing and actually add in the border and padding.