Chromium Code Reviews| Index: LayoutTests/css3/device-adapt/viewport-height-extend-to-zoom.html |
| diff --git a/LayoutTests/css3/device-adapt/viewport-user-style.html b/LayoutTests/css3/device-adapt/viewport-height-extend-to-zoom.html |
| similarity index 63% |
| copy from LayoutTests/css3/device-adapt/viewport-user-style.html |
| copy to LayoutTests/css3/device-adapt/viewport-height-extend-to-zoom.html |
| index 70d77f0426e8d06045bc96960ed0074193ae5db6..3d0144e087e92a13dec3806ec69f55cab21cceda 100644 |
| --- a/LayoutTests/css3/device-adapt/viewport-user-style.html |
| +++ b/LayoutTests/css3/device-adapt/viewport-height-extend-to-zoom.html |
| @@ -1,15 +1,12 @@ |
| <!DOCTYPE html> |
| <html> |
| <head> |
| - <title>User stylesheet containing an @viewport rule</title> |
| + <title>Viewport 'height' descriptor has 'extend-to-zoom' value</title> |
| <script src="../../resources/testharness.js"></script> |
| <script src="../../resources/testharnessreport.js"></script> |
| <style> |
| html, body { width: 100%; height: 100%; margin: 0 } |
| - |
| - @viewport { |
| - height: 2000px; |
| - } |
| + @viewport { height: -internal-extend-to-zoom; zoom: 2.0; } |
| </style> |
| <script> |
| test(function(){ |
| @@ -17,7 +14,7 @@ |
| }, "Check that window.testRunner is present. Required to add a user stylesheet."); |
| if (window.testRunner) { |
| - testRunner.addUserStyleSheet("@viewport { width: 450px; height: auto; zoom: auto; min-zoom: auto; max-zoom: auto }", true); |
| + testRunner.addUserStyleSheet("@viewport { width: -internal-extend-to-zoom 980px; min-zoom: 0.25; max-zoom: 5; height: auto ; zoom: auto; }", true); |
|
kenneth.r.christiansen
2013/07/18 14:55:35
There is no auto for zoom, according to the spec
|
| } |
| </script> |
| </head> |
| @@ -35,18 +32,12 @@ |
| var match = /viewport size (.+)x(.+) scale (.+ )/.exec(vpString); |
| if (match) { |
| - actualWidth = parseFloat(match[1]); |
| actualHeight = parseFloat(match[2]); |
| } |
| test(function(){ |
| - assert_equals(actualWidth, 450); |
| - }, "Check that we get the viewport width from the user stylesheet."); |
| - document.body.offsetHeight; |
| - |
| - test(function(){ |
| - assert_equals(actualHeight, 2000); |
| - }, "Check that we get the viewport height from the author stylesheet."); |
| + assert_equals(actualHeight, 176); |
| + }, "Check viewport height is 'initial-height / extend-zoom'."); |
| </script> |
| </body> |
| </html> |