Chromium Code Reviews| Index: chrome/test/data/pdf/zoom_manager_test.js |
| diff --git a/chrome/test/data/pdf/zoom_manager_test.js b/chrome/test/data/pdf/zoom_manager_test.js |
| index f02010c61d099308f9b69c87b31125456640599c..513c40e20892c659ae2312c625e752ae7eca4146 100644 |
| --- a/chrome/test/data/pdf/zoom_manager_test.js |
| +++ b/chrome/test/data/pdf/zoom_manager_test.js |
| @@ -53,7 +53,7 @@ chrome.test.runTests(function() { |
| function testZoomChange() { |
| let viewport = new MockViewport(); |
| let browserZoomSetter = new MockBrowserZoomSetter(); |
| - let zoomManager = new ZoomManager( |
| + let zoomManager = ZoomManager.create(BrowserApi.ZoomBehaviour.MANAGE, |
|
Sam McNally
2016/11/18 04:59:23
Wrap these either
functionName(arg1, arg2,
Kevin McNee
2016/11/22 23:17:32
Done.
|
| viewport, browserZoomSetter.setBrowserZoom.bind(browserZoomSetter), |
| 1); |
| viewport.zoom = 2; |
| @@ -65,7 +65,8 @@ chrome.test.runTests(function() { |
| function testBrowserZoomChange() { |
| let viewport = new MockViewport(); |
| - let zoomManager = new ZoomManager(viewport, chrome.test.fail, 1); |
| + let zoomManager = ZoomManager.create( |
| + BrowserApi.ZoomBehaviour.MANAGE, viewport, chrome.test.fail, 1); |
| zoomManager.onBrowserZoomChange(3); |
| chrome.test.assertEq(1, viewport.zooms.length); |
| chrome.test.assertEq(3, viewport.zooms[0]); |
| @@ -73,10 +74,28 @@ chrome.test.runTests(function() { |
| chrome.test.succeed(); |
| }, |
| + function testBrowserZoomChangeEmbedded() { |
| + let viewport = new MockViewport(); |
| + let zoomManager = ZoomManager.create( |
| + BrowserApi.ZoomBehaviour.PROPAGATE_PARENT, viewport, |
| + function() { return Promise.reject(); }, 1); |
| + |
| + zoomManager.onBrowserZoomChange(2); |
| + chrome.test.assertEq(2, viewport.zoom); |
| + |
| + // Zooming in the browser should not overwrite the viewport's zoom, |
| + // but cause the viewport to zoom in as well. |
| + viewport.zoom = 3; |
| + zoomManager.onBrowserZoomChange(3); |
| + chrome.test.assertTrue(viewport.zoom > 3); |
| + |
| + chrome.test.succeed(); |
| + }, |
| + |
| function testSmallZoomChange() { |
| let viewport = new MockViewport(); |
| let browserZoomSetter = new MockBrowserZoomSetter(); |
| - let zoomManager = new ZoomManager( |
| + let zoomManager = ZoomManager.create(BrowserApi.ZoomBehaviour.MANAGE, |
| viewport, browserZoomSetter.setBrowserZoom.bind(browserZoomSetter), |
| 2); |
| viewport.zoom = 2.0001; |
| @@ -88,7 +107,8 @@ chrome.test.runTests(function() { |
| function testSmallBrowserZoomChange() { |
| let viewport = new MockViewport(); |
| - let zoomManager = new ZoomManager(viewport, chrome.test.fail, 1); |
| + let zoomManager = ZoomManager.create(BrowserApi.ZoomBehaviour.MANAGE, |
| + viewport, chrome.test.fail, 1); |
| zoomManager.onBrowserZoomChange(0.999); |
| chrome.test.assertEq(0, viewport.zooms.length); |
| chrome.test.assertEq(1, viewport.zoom); |
| @@ -98,7 +118,7 @@ chrome.test.runTests(function() { |
| function testMultiplePdfZoomChanges() { |
| let viewport = new MockViewport(); |
| let browserZoomSetter = new MockBrowserZoomSetter(); |
| - let zoomManager = new ZoomManager( |
| + let zoomManager = ZoomManager.create(BrowserApi.ZoomBehaviour.MANAGE, |
| viewport, browserZoomSetter.setBrowserZoom.bind(browserZoomSetter), |
| 1); |
| viewport.zoom = 2; |
| @@ -117,7 +137,8 @@ chrome.test.runTests(function() { |
| function testMultipleBrowserZoomChanges() { |
| let viewport = new MockViewport(); |
| - let zoomManager = new ZoomManager(viewport, chrome.test.fail, 1); |
| + let zoomManager = ZoomManager.create(BrowserApi.ZoomBehaviour.MANAGE, |
| + viewport, chrome.test.fail, 1); |
| zoomManager.onBrowserZoomChange(2); |
| zoomManager.onBrowserZoomChange(3); |
| chrome.test.assertEq(2, viewport.zooms.length); |