Index: third_party/WebKit/LayoutTests/fast/replaced/table-percent-height.html |
diff --git a/third_party/WebKit/LayoutTests/fast/replaced/table-percent-height.html b/third_party/WebKit/LayoutTests/fast/replaced/table-percent-height.html |
index fce47a1c254b09707d8a48b248ef9fd2f9e3c310..234104caff2e7509f63d6f002e0d638a965a82cc 100644 |
--- a/third_party/WebKit/LayoutTests/fast/replaced/table-percent-height.html |
+++ b/third_party/WebKit/LayoutTests/fast/replaced/table-percent-height.html |
@@ -41,21 +41,6 @@ function parsePixelValue(str) |
return parseFloat(str); |
} |
-function is75PercentOf(expression75, expression100) |
-{ |
- var str75 = eval(expression75); |
- var str100 = eval(expression100); |
- var num75 = parsePixelValue(str75); |
- var num100 = parsePixelValue(str100); |
- if (num75 < 0 || num100 < 0) |
- return; |
- var expectedValue = num100 * 75 / 100; |
- if (num75 == expectedValue) |
- testPassed(expression75 + " is 75% of " + expression100 + "."); |
- else |
- testFailed(expression75 + " [" + str75 + "] is not 75% of " + expression100 + " [" + str100 + "]."); |
-} |
- |
function test() |
{ |
description("This test checks that replaced elements with percentage heights within table cells have the correct height.<br>Note, some of the button height tests fail on the Windows ports. See bug #34071."); |
@@ -94,14 +79,12 @@ function test() |
shouldBe("getHeight('input-button-75')", "getHeight('input-button-100')"); |
shouldBe("getWidth('input-checkbox-75')", "getWidth('input-checkbox-100')"); |
- shouldBeTrue("getHeight('input-checkbox-75') != '0px'"); |
- // Note: This behavior doesn't match to Firefox 3.5 and Opera 10. |
- is75PercentOf("getHeight('input-checkbox-75')", "getHeight('input-checkbox-100')"); |
+ shouldBeTrue("getHeight('input-checkbox-75') == '0px'"); |
+ shouldBe("getHeight('input-checkbox-75')", "getHeight('input-checkbox-100')"); |
shouldBe("getWidth('input-file-75')", "getWidth('input-file-100')"); |
shouldBeTrue("getHeight('input-file-75') != '0px'"); |
- // Note: This behavior doesn't match to Firefox 3.5 and Opera 10. |
- is75PercentOf("getHeight('input-file-75')", "getHeight('input-file-100')"); |
+ shouldBe("getHeight('input-file-75')", "getHeight('input-file-100')"); |
// Note: This behavior doesn't match to Firefox 3.5 and Opera 10. |
shouldBe("getWidth('input-image-75')", "'75px'"); |
@@ -110,9 +93,8 @@ function test() |
shouldBe("getHeight('input-image-100')", "'100px'"); |
shouldBe("getWidth('input-radio-75')", "getWidth('input-radio-100')"); |
- shouldBeTrue("getHeight('input-radio-75') != '0px'"); |
- // Note: This behavior doesn't match to Firefox 3.5 and Opera 10. |
- is75PercentOf("getHeight('input-radio-75')", "getHeight('input-radio-100')"); |
+ shouldBeTrue("getHeight('input-radio-75') == '0px'"); |
+ shouldBe("getHeight('input-radio-75')", "getHeight('input-radio-100')"); |
shouldBe("getWidth('input-reset-75')", "getWidth('input-reset-100')"); |
shouldBeTrue("getHeight('input-reset-75') != '0px'"); |