Index: LayoutTests/fast/block/min-max-height-percent-height-child.html |
diff --git a/LayoutTests/fast/block/min-max-height-percent-height-child.html b/LayoutTests/fast/block/min-max-height-percent-height-child.html |
index eff1e95c4e1f67dec68a88f97b07a62f7eecdf0d..e4eeae868a54fe2cff0db14866e59a73ac52ab25 100644 |
--- a/LayoutTests/fast/block/min-max-height-percent-height-child.html |
+++ b/LayoutTests/fast/block/min-max-height-percent-height-child.html |
@@ -35,51 +35,51 @@ |
<h2>Each of the following tests should display a green rectangle with a 1 pixel red border on all sides.</h2> |
<h3>Parent with fixed height and min set</h2> |
<div id="simple-min" class="parent" style="width: 50px; height: 50px; min-height: 75px"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="50px" data-expected-height="75px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="50" data-expected-height="75"></div> |
</div> |
<h3>Parent with fixed height and max set</h2> |
<div id="simple-max" class="parent" style="max-height: 25px; width: 50px; height: 50px"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="50px" data-expected-height="25px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="50" data-expected-height="25"></div> |
</div> |
<h3>Parent with fixed height and min greater than max</h2> |
<div id="min-greater-max" class="parent" style="width: 50px; height: 50px; min-height: 75px; max-height: 25px"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="50px" data-expected-height="75px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="50" data-expected-height="75"></div> |
</div> |
<h3>Vertical parent with fixed width and max set</h2> |
<div id="vertical-max" class="parent" style="width: 50px; max-width: 25px; height: 50px"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="25px" data-expected-height="50px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="25" data-expected-height="50"></div> |
</div> |
<h3>Vertical parent with fixed width and min set</h2> |
<div id="vertical-min" class="parent" style="width: 50px; min-width: 75px; height: 50px"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="75px" data-expected-height="50px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="75" data-expected-height="50"></div> |
</div> |
<h3>Parent with percent height and a max set</h3> |
<div class="container bottom-margin"> |
<div id="parent-percent-max" class="parent" style="max-height: 25px; width: 50px; height: 100%"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="50px" data-expected-height="25px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="50" data-expected-height="25"></div> |
</div> |
</div> |
<h3>Parent with percent height and a min set</h3> |
<div class="container bottom-margin"> |
<div id="parent-percent-min" class="parent" style="width: 50px; height: 100%; min-height: 75px"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="50px" data-expected-height="75px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="50" data-expected-height="75"></div> |
</div> |
</div> |
<h3>Parent with fixed height and percentage max</h3> |
<div class="container"> |
<div id="percent-max" class="parent" style="max-height: 50%; width: 50px; height: 50px"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="50px" data-expected-height="25px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="50" data-expected-height="25"></div> |
</div> |
</div> |
<h3>Parent with fixed height and percentage min</h3> |
<div class="container bottom-margin"> |
<div id="percent-min" class="parent" style="width: 50px; height: 50px; min-height: 150%"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="50px" data-expected-height="75px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="50" data-expected-height="75"></div> |
</div> |
</div> |
<h3>Parent with auto height and a max set. This test will not have the border all around, it will only be on the top portion.</h3> |
<div id="auto-max" class="parent ahem bottom-margin" style="max-height: 25px; width: 50px"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="50px" data-expected-height="0px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="50" data-expected-height="0"></div> |
XXXXX |
XXXXX |
XXXXX |
@@ -91,7 +91,7 @@ |
</div> |
<h3>Parent with auto height and a min set</h3> |
<div id="auto-min" class="parent ahem" style="width: 50px; min-height: 75px"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="50px" data-expected-height="0px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="50" data-expected-height="0"></div> |
XXXXX |
XXXXX |
XXXXX |
@@ -104,15 +104,15 @@ |
<h2>The following two tests will have a 6 pixel red border.</h2> |
<h3>Parent with fixed height and padding and max set</h2> |
<div id="parent-padding-max" class="parent" style="max-height: 25px; width: 50px; padding: 5px; height: 50px"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="50px" data-expected-height="25px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="50" data-expected-height="25"></div> |
</div> |
<h3>Parent with fixed height and padding and min set</h2> |
<div id="parent-padding-min" class="parent" style="width: 50px; padding: 5px; height: 50px; min-height: 75px"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="50px" data-expected-height="75px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="50" data-expected-height="75"></div> |
</div> |
<h3>Fixed height parent with scroll bar</h3> |
<div id="overflow" class="parent ahem" style="overflow: scroll; min-height: 75px; width: 50px; height: 50px"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="35px" data-expected-height="60px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="35" data-expected-height="60"></div> |
XXXXXXXXXX |
XXXXXXXXXX |
XXXXXXXXXX |
@@ -123,7 +123,7 @@ |
<h3>Parent with percent height and scroll bar</h3> |
<div class="container bottom-margin"> |
<div id="overflow-percent" class="parent ahem" style="overflow: scroll; min-height: 75px; width: 50px; height: 100%"> |
- <div class="child" style="width: 100%; height: 100%" data-expected-width="35px" data-expected-height="60px"></div> |
+ <div class="child" style="width: 100%; height: 100%" data-expected-width="35" data-expected-height="60"></div> |
XXXXXXXXXX |
XXXXXXXXXX |
XXXXXXXXXX |