| Index: chrome/test/data/extensions/platform_apps/web_view/shim/main.js
|
| diff --git a/chrome/test/data/extensions/platform_apps/web_view/shim/main.js b/chrome/test/data/extensions/platform_apps/web_view/shim/main.js
|
| index c3d0eae03edcb93187c37c2f1c36d65e7bb1a084..5edab6fff041b3844d46e3c6ee305e9331fabf09 100644
|
| --- a/chrome/test/data/extensions/platform_apps/web_view/shim/main.js
|
| +++ b/chrome/test/data/extensions/platform_apps/web_view/shim/main.js
|
| @@ -170,36 +170,30 @@ function testAutosizeWithPartialAttributes() {
|
|
|
| var step = 1;
|
| var sizeChangeHandler = function(e) {
|
| + window.console.log('sizeChangeHandler, new: ' +
|
| + e.newWidth + ' X ' + e.newHeight);
|
| switch (step) {
|
| case 1:
|
| // Expect 300x200.
|
| embedder.test.assertEq(300, e.newWidth);
|
| embedder.test.assertEq(200, e.newHeight);
|
|
|
| - // Remove an autosize attribute and verify that it causes relayout.
|
| - webview.minwidth = null;
|
| + // Change the min size to cause a relayout.
|
| + webview.minwidth = 500;
|
| break;
|
| case 2:
|
| - // Expect 640x?
|
| - embedder.test.assertEq(640, e.newWidth);
|
| + embedder.test.assertTrue(e.newWidth >= webview.minwidth);
|
| + embedder.test.assertTrue(e.newWidth <= webview.maxwidth);
|
|
|
| // Tests when minwidth > maxwidth, minwidth = maxwidth.
|
| - webview.maxheight = null;
|
| + // i.e. minwidth is essentially 700.
|
| webview.minwidth = 800;
|
| - webview.minheight = 800;
|
| break;
|
| case 3:
|
| - // Expect 700X480
|
| + // Expect 700X?
|
| embedder.test.assertEq(700, e.newWidth);
|
| - embedder.test.assertEq(480, e.newHeight);
|
| -
|
| - // Remove maxwidth and make sure the size returns to plugin size.
|
| - webview.removeAttribute('maxwidth');
|
| - break;
|
| - case 4:
|
| - // Expect original size, 640x480.
|
| - embedder.test.assertEq(640, e.newWidth);
|
| - embedder.test.assertEq(480, e.newHeight);
|
| + embedder.test.assertTrue(e.newHeight >= 200);
|
| + embedder.test.assertTrue(e.newHeight <= 600);
|
|
|
| embedder.test.succeed();
|
| break;
|
|
|