Changeset 160159 in webkit

Timestamp:

Dec 4, 2013, 9:11:06 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

% unit heights don't work if parent block height is set in vh
​https://bugs.webkit.org/show_bug.cgi?id=118516

Patch by Gurpreet Kaur <​k.gurpreet@samsung.com> on 2013-12-04
Reviewed by Simon Fraser.

From Blink r156449 by <​srinivasa.ragavan.venkateswaran@intel.com>

Source/WebCore:

An element having height as percentage needs to have the
containingblock's height or availableheight to calculate its
own height. The containing block having a height set in vh
unit was not being considered for calculating the child's
height.

Tests: fast/css/viewport-percentage-compute-box-height.html

fast/css/viewport-percentage-compute-box-width.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computePercentageLogicalHeight):
Correct child's height(in pecentage) was not being calculated
incase of parent having height set in vh unit. Added condition
to calculate the containing block height in terms of viewport size.

LayoutTests:

• fast/css/viewport-percentage-compute-box-height-expected.html: Added.
• fast/css/viewport-percentage-compute-box-height.html: Added.
• fast/css/viewport-percentage-compute-box-width-expected.html: Added.
• fast/css/viewport-percentage-compute-box-width.html: Added.

Added new tests for verifying that percentage unit height/width works
if parent block height/width is set in vh/vw units.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/viewport-percentage-compute-box-height-expected.html (added)
• LayoutTests/fast/css/viewport-percentage-compute-box-height.html (added)
• LayoutTests/fast/css/viewport-percentage-compute-box-width-expected.html (added)
• LayoutTests/fast/css/viewport-percentage-compute-box-width.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-12-04  Gurpreet Kaur  <k.gurpreet@samsung.com>
+
+        % unit heights don't work if parent block height is set in vh
+        https://bugs.webkit.org/show_bug.cgi?id=118516
+
+        Reviewed by Simon Fraser.
+
+        From Blink r156449 by <srinivasa.ragavan.venkateswaran@intel.com>
+
+        * fast/css/viewport-percentage-compute-box-height-expected.html: Added.
+        * fast/css/viewport-percentage-compute-box-height.html: Added.
+        * fast/css/viewport-percentage-compute-box-width-expected.html: Added.
+        * fast/css/viewport-percentage-compute-box-width.html: Added.
+        Added new tests for verifying that percentage unit height/width works
+        if parent block height/width is set in vh/vw units.
+
 2013-12-04  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-04  Gurpreet Kaur  <k.gurpreet@samsung.com>
+
+        % unit heights don't work if parent block height is set in vh
+        https://bugs.webkit.org/show_bug.cgi?id=118516
+
+        Reviewed by Simon Fraser.
+
+        From Blink r156449 by <srinivasa.ragavan.venkateswaran@intel.com>
+
+        An element having height as percentage needs to have the
+        containingblock's height or availableheight to calculate its
+        own height. The containing block having a height set in vh
+        unit was not being considered for calculating the child's
+        height.
+
+        Tests: fast/css/viewport-percentage-compute-box-height.html
+               fast/css/viewport-percentage-compute-box-width.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computePercentageLogicalHeight):
+        Correct child's height(in pecentage) was not being calculated
+        incase of parent having height set in vh unit. Added condition
+        to calculate the containing block height in terms of viewport size.
+
 2013-12-04  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2727 +2727 @@
             // return value from the recursive call will not have been adjusted
             // yet.
+            LayoutUnit contentBoxHeight = cb->constrainContentBoxLogicalHeightByMinMax(contentBoxHeightWithScrollbar - cb->scrollbarLogicalHeight());
+            availableHeight = std::max<LayoutUnit>(0, contentBoxHeight);
+        }
+    } else if (cbstyle.logicalHeight().isViewportPercentage()) {
+        LayoutUnit heightWithScrollbar = valueForLength(cbstyle.logicalHeight(), 0, &view());
+        if (heightWithScrollbar != -1) {
+            LayoutUnit contentBoxHeightWithScrollbar = cb->adjustContentBoxLogicalHeightForBoxSizing(heightWithScrollbar);
+            // We need to adjust for min/max height because this method does 
+            // not handle the min/max of the current block, its caller does.
+            // So the return value from the recursive call will not have been
+            // adjusted yet.
             LayoutUnit contentBoxHeight = cb->constrainContentBoxLogicalHeightByMinMax(contentBoxHeightWithScrollbar - cb->scrollbarLogicalHeight());
             availableHeight = std::max<LayoutUnit>(0, contentBoxHeight);