Changeset 123031 in webkit

Timestamp:

Jul 18, 2012 3:28:21 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

Content size of child having percent height inside a fixed height container having overflow:auto is wrongly calculated
​https://bugs.webkit.org/show_bug.cgi?id=11355

Patch by Pravin D <​pravind.2k4@gmail.com> on 2012-07-18
Reviewed by Julien Chaffraix.

Source/WebCore:

The content height of a child must be container height minus padding, border width and height of horizontal scrollbar(if any).

Tests: fast/overflow/child-100percent-height-inside-fixed-container-with-overflow-auto.html

fast/overflow/replaced-child-100percent-height-inside-fixed-container-with-overflow-auto.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computePercentageLogicalHeight):
(WebCore::RenderBox::computeReplacedLogicalHeightUsing):
Subtracting the height of the scrollbar from the client height when the client has percentage height.

LayoutTests:

• fast/overflow/child-100percent-height-inside-fixed-container-with-overflow-auto-expected.txt: Added.
• fast/overflow/child-100percent-height-inside-fixed-container-with-overflow-auto.html: Added.
• fast/overflow/replaced-child-100percent-height-inside-fixed-container-with-overflow-auto-expected.txt: Added.
• fast/overflow/replaced-child-100percent-height-inside-fixed-container-with-overflow-auto.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/overflow/child-100percent-height-inside-fixed-container-with-overflow-auto-expected.txt (added)
• LayoutTests/fast/overflow/child-100percent-height-inside-fixed-container-with-overflow-auto.html (added)
• LayoutTests/fast/overflow/replaced-child-100percent-height-inside-fixed-container-with-overflow-auto-expected.txt (added)
• LayoutTests/fast/overflow/replaced-child-100percent-height-inside-fixed-container-with-overflow-auto.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-07-18  Pravin D  <pravind.2k4@gmail.com>
+
+        Content size of child having percent height inside a fixed height container having overflow:auto is wrongly calculated
+        https://bugs.webkit.org/show_bug.cgi?id=11355
+
+        Reviewed by Julien Chaffraix.
+
+        * fast/overflow/child-100percent-height-inside-fixed-container-with-overflow-auto-expected.txt: Added.
+        * fast/overflow/child-100percent-height-inside-fixed-container-with-overflow-auto.html: Added.
+        * fast/overflow/replaced-child-100percent-height-inside-fixed-container-with-overflow-auto-expected.txt: Added.
+        * fast/overflow/replaced-child-100percent-height-inside-fixed-container-with-overflow-auto.html: Added.
+
 2012-07-18  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-07-18  Pravin D  <pravind.2k4@gmail.com>
+
+        Content size of child having percent height inside a fixed height container having overflow:auto is wrongly calculated
+        https://bugs.webkit.org/show_bug.cgi?id=11355
+
+        Reviewed by Julien Chaffraix.
+
+        The content height of a child must be container height minus padding, border width and height of horizontal scrollbar(if any).
+
+        Tests: fast/overflow/child-100percent-height-inside-fixed-container-with-overflow-auto.html
+               fast/overflow/replaced-child-100percent-height-inside-fixed-container-with-overflow-auto.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computePercentageLogicalHeight):
+        (WebCore::RenderBox::computeReplacedLogicalHeightUsing):
+        Subtracting the height of the scrollbar from the client height when the client has percentage height.
+
 2012-07-18  Anantanarayanan G Iyengar  <ananta@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2124 +2124 @@
             includeBorderPadding = true;
         }
-    }
-    // Otherwise we only use our percentage height if our containing block had a specified
-    // height.
-    else if (cbstyle->logicalHeight().isFixed())
-        result = cb->computeContentBoxLogicalHeight(cbstyle->logicalHeight().value());
-    else if (cbstyle->logicalHeight().isPercent() && !isOutOfFlowPositionedWithSpecifiedHeight) {
+    } else if (cbstyle->logicalHeight().isFixed()) {
+        // Otherwise we only use our percentage height if our containing block had a specified height.
+        LayoutUnit contentBoxHeightWithScrollbar = cb->computeContentBoxLogicalHeight(cbstyle->logicalHeight().value());
+        result = max<LayoutUnit>(0, contentBoxHeightWithScrollbar - cb->scrollbarLogicalHeight());
+    } else if (cbstyle->logicalHeight().isPercent() && !isOutOfFlowPositionedWithSpecifiedHeight) {
         // We need to recur and compute the percentage height for our containing block.
         result = cb->computePercentageLogicalHeight(cbstyle->logicalHeight());
@@ -2266 +2265 @@
                 }
             }
-            return computeContentBoxLogicalHeight(valueForLength(logicalHeight, availableHeight));
+            availableHeight = computeContentBoxLogicalHeight(valueForLength(logicalHeight, availableHeight));
+            if (cb->style()->logicalHeight().isFixed())
+                availableHeight = max<LayoutUnit>(0, availableHeight - toRenderBox(cb)->scrollbarLogicalHeight());
+            return availableHeight;
         }
         case ViewportPercentageWidth: