Changeset 139548 in webkit

Timestamp:

Jan 12, 2013 4:59:55 AM (11 years ago)

Author:

robert@webkit.org

Message:

Available height should respect min and max height
​https://bugs.webkit.org/show_bug.cgi?id=106479

Source/WebCore:

Reviewed by Ojan Vafai.

When calculating a relative positioned block's offset as a percentage of its container, respect the min
and max height set on the container

Tests: fast/block/percent-top-respects-max-height.html

fast/block/percent-top-respects-min-height.html

• rendering/RenderBox.cpp:

(WebCore::RenderBox::availableLogicalHeight):

LayoutTests:

Reviewed by Ojan Vafai.

• fast/block/percent-top-respects-max-height-expected.txt: Added.
• fast/block/percent-top-respects-max-height.html: Added.
• fast/block/percent-top-respects-min-height-expected.txt: Added.
• fast/block/percent-top-respects-min-height.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/block/percent-top-respects-max-height-expected.txt (added)
• LayoutTests/fast/block/percent-top-respects-max-height.html (added)
• LayoutTests/fast/block/percent-top-respects-min-height-expected.txt (added)
• LayoutTests/fast/block/percent-top-respects-min-height.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderBox.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-01-12  Robert Hogan  <robert@webkit.org>
+
+        Available height should respect min and max height
+        https://bugs.webkit.org/show_bug.cgi?id=106479
+
+        Reviewed by Ojan Vafai.
+
+        * fast/block/percent-top-respects-max-height-expected.txt: Added.
+        * fast/block/percent-top-respects-max-height.html: Added.
+        * fast/block/percent-top-respects-min-height-expected.txt: Added.
+        * fast/block/percent-top-respects-min-height.html: Added.
+
 2013-01-12  Victor Carbune  <victor@rosedu.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-01-12  Robert Hogan  <robert@webkit.org>
+
+        Available height should respect min and max height
+        https://bugs.webkit.org/show_bug.cgi?id=106479
+
+        Reviewed by Ojan Vafai.
+        
+        When calculating a relative positioned block's offset as a percentage of its container, respect the min
+        and max height set on the container
+
+        Tests: fast/block/percent-top-respects-max-height.html
+               fast/block/percent-top-respects-min-height.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::availableLogicalHeight):
+
 2013-01-12  Victor Carbune  <victor@rosedu.org>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -2628 +2628 @@
 LayoutUnit RenderBox::availableLogicalHeight(AvailableLogicalHeightType heightType) const
 {
-    return availableLogicalHeightUsing(style()->logicalHeight(), heightType);
+    return constrainLogicalHeightByMinMax(availableLogicalHeightUsing(style()->logicalHeight(), heightType));
 }