Changeset 140171 in webkit

Timestamp:

Jan 18, 2013 10:02:08 AM (11 years ago)

Author:

tony@chromium.org

Message:

Incorrect scrollable height during simplified layout
​https://bugs.webkit.org/show_bug.cgi?id=107193

Reviewed by Ojan Vafai.

Source/WebCore:

Test: fast/overflow/height-during-simplified-layout.html

When computing overflow, we use the height of the block before it was clamped
(i.e., before updateLogicalHeight() has been called).

During simplfied layout, we use the previous sizes rather than doing a full
layout. We still compute overflow, but we were using the clamped height rather
than the full height.

This caused us to incorrectly compute the overflow by the vertical padding.
Since we were passing in the already clamped clientHeight to RenderBlock::computeOverflow,
we would only include the overflow from our children sizes and not include the overflow
from ourselves caused by padding + content.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::simplifiedLayout): Use the scrollable height rather than the
already clamped height.

LayoutTests:

• fast/overflow/height-during-simplified-layout-expected.txt: Added.
• fast/overflow/height-during-simplified-layout.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/overflow/height-during-simplified-layout-expected.txt (added)
• LayoutTests/fast/overflow/height-during-simplified-layout.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-18  Tony Chang  <tony@chromium.org>
+
+        Incorrect scrollable height during simplified layout
+        https://bugs.webkit.org/show_bug.cgi?id=107193
+
+        Reviewed by Ojan Vafai.
+
+        * fast/overflow/height-during-simplified-layout-expected.txt: Added.
+        * fast/overflow/height-during-simplified-layout.html: Added.
+
 2013-01-18  Dominik Röttsches  <dominik.rottsches@intel.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-18  Tony Chang  <tony@chromium.org>
+
+        Incorrect scrollable height during simplified layout
+        https://bugs.webkit.org/show_bug.cgi?id=107193
+
+        Reviewed by Ojan Vafai.
+
+        Test: fast/overflow/height-during-simplified-layout.html
+
+        When computing overflow, we use the height of the block before it was clamped
+        (i.e., before updateLogicalHeight() has been called).
+
+        During simplfied layout, we use the previous sizes rather than doing a full
+        layout. We still compute overflow, but we were using the clamped height rather
+        than the full height.
+
+        This caused us to incorrectly compute the overflow by the vertical padding.
+        Since we were passing in the already clamped clientHeight to RenderBlock::computeOverflow,
+        we would only include the overflow from our children sizes and not include the overflow
+        from ourselves caused by padding + content.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::simplifiedLayout): Use the scrollable height rather than the
+        already clamped height.
+
 2013-01-18  Joe Mason  <jmason@rim.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2597 +2597 @@
     // lowestPosition on every relayout so it's not a regression.
     m_overflow.clear();
-    computeOverflow(clientLogicalBottom(), true);
+    LayoutUnit logicalScrollHeight = style()->isHorizontalWritingMode() ? scrollHeight() : scrollWidth();
+    computeOverflow(borderBefore() + logicalScrollHeight, true);
 
     statePusher.pop();