OOP PDF: Reset FittingType when manually setting the zoom.

chrome/test/data/pdf/viewport_test.js

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 var tests = [
   function testDocumentNeedsScrollbars() {
     var viewport =
         new Viewport(new MockWindow(100, 100), new MockSizer(), function() {},
                      function() {}, function() {}, 10, 0);
     var scrollbars;
@@ skipping 91 matching lines @@
     chrome.test.assertEq('400px', mockSizer.style.width);
     chrome.test.assertEq('400px', mockSizer.style.height);
     chrome.test.assertEq(100, mockWindow.pageXOffset);
     chrome.test.assertEq(100, mockWindow.pageYOffset);
     mockWindow.scrollTo(250, 250);
     viewport.setZoom(1);
     chrome.test.assertEq('200px', mockSizer.style.width);
     chrome.test.assertEq('200px', mockSizer.style.height);
     chrome.test.assertEq(100, mockWindow.pageXOffset);
     chrome.test.assertEq(100, mockWindow.pageYOffset);
+
+    var documentDimensions = new MockDocumentDimensions(0, 0);
+    documentDimensions.addPage(200, 200);
+    viewport.setDocumentDimensions(documentDimensions);
+    mockWindow.scrollTo(0, 0);
+    viewport.fitToPage();
+    viewport.setZoom(1);
+    chrome.test.assertEq(Viewport.FittingType.NONE, viewport.fittingType);
+    chrome.test.assertEq('200px', mockSizer.style.width);
+    chrome.test.assertEq('200px', mockSizer.style.height);
+    chrome.test.assertEq(0, mockWindow.pageXOffset);
+    chrome.test.assertEq(0, mockWindow.pageYOffset);
+
+    viewport.fitToWidth();
+    viewport.setZoom(1);
+    chrome.test.assertEq(Viewport.FittingType.NONE, viewport.fittingType);
+    chrome.test.assertEq('200px', mockSizer.style.width);
+    chrome.test.assertEq('200px', mockSizer.style.height);
+    chrome.test.assertEq(0, mockWindow.pageXOffset);
+    chrome.test.assertEq(0, mockWindow.pageYOffset);
+
     chrome.test.succeed();
   },
 
   function testGetMostVisiblePage() {
     var mockWindow = new MockWindow(100, 100);
     var viewport = new Viewport(mockWindow, new MockSizer(), function() {},
                                 function() {}, function() {}, 0, 0);
 
     var documentDimensions = new MockDocumentDimensions(100, 100);
     documentDimensions.addPage(50, 100);
@@ skipping 45 matching lines @@
     var viewport = new Viewport(mockWindow, mockSizer, mockCallback.callback,
                                 function() {}, function() {}, 0, 0);
     var documentDimensions = new MockDocumentDimensions();
 
     // Test with a document width which matches the window width.
     documentDimensions.addPage(100, 100);
     viewport.setDocumentDimensions(documentDimensions);
     viewport.setZoom(0.1);
     mockCallback.reset();
     viewport.fitToWidth();
+    chrome.test.assertEq(Viewport.FittingType.FIT_TO_WIDTH,
+                         viewport.fittingType);
     chrome.test.assertTrue(mockCallback.wasCalled);
     chrome.test.assertEq('100px', mockSizer.style.width);
     chrome.test.assertEq(1, viewport.zoom);
 
     // Test with a document width which is twice the size of the window width.
     documentDimensions.reset();
     documentDimensions.addPage(200, 100);
     viewport.setDocumentDimensions(documentDimensions);
     mockCallback.reset();
     viewport.fitToWidth();
+    chrome.test.assertEq(Viewport.FittingType.FIT_TO_WIDTH,
+                         viewport.fittingType);
     chrome.test.assertTrue(mockCallback.wasCalled);
     chrome.test.assertEq('100px', mockSizer.style.width);
     chrome.test.assertEq(0.5, viewport.zoom);
 
     // Test with a document width which is half the size of the window width.
     documentDimensions.reset();
     documentDimensions.addPage(50, 100);
     viewport.setDocumentDimensions(documentDimensions);
     mockCallback.reset();
     viewport.fitToWidth();
+    chrome.test.assertEq(Viewport.FittingType.FIT_TO_WIDTH,
+                         viewport.fittingType);
     chrome.test.assertTrue(mockCallback.wasCalled);
     chrome.test.assertEq('100px', mockSizer.style.width);
     chrome.test.assertEq(2, viewport.zoom);
 
     // Test that the scroll position stays the same relative to the page after
     // fit to page is called.
     documentDimensions.reset();
     documentDimensions.addPage(50, 400);
     viewport.setDocumentDimensions(documentDimensions);
     viewport.setZoom(1);
     mockWindow.scrollTo(0, 100);
     mockCallback.reset();
     viewport.fitToWidth();
+    chrome.test.assertEq(Viewport.FittingType.FIT_TO_WIDTH,
+                         viewport.fittingType);
     chrome.test.assertTrue(mockCallback.wasCalled);
     chrome.test.assertEq(2, viewport.zoom);
     chrome.test.assertEq(0, viewport.position.x);
     chrome.test.assertEq(200, viewport.position.y);
 
     // Test fitting works with scrollbars. The page will need to be zoomed to
     // fit to width, which will cause the page height to span outside of the
     // viewport, triggering 15px scrollbars to be shown.
     viewport = new Viewport(mockWindow, mockSizer, mockCallback.callback,
                             function() {}, function() {}, 15, 0);
     documentDimensions.reset();
     documentDimensions.addPage(50, 100);
     viewport.setDocumentDimensions(documentDimensions);
     mockCallback.reset();
     viewport.fitToWidth();
+    chrome.test.assertEq(Viewport.FittingType.FIT_TO_WIDTH,
+                         viewport.fittingType);
     chrome.test.assertTrue(mockCallback.wasCalled);
     chrome.test.assertEq('85px', mockSizer.style.width);
     chrome.test.assertEq(1.7, viewport.zoom);
     chrome.test.succeed();
   },
 
   function testFitToPage() {
     var mockWindow = new MockWindow(100, 100);
     var mockSizer = new MockSizer();
     var mockCallback = new MockViewportChangedCallback();
     var viewport = new Viewport(mockWindow, mockSizer, mockCallback.callback,
                                 function() {}, function() {}, 0, 0);
     var documentDimensions = new MockDocumentDimensions();
 
     // Test with a page size which matches the window size.
     documentDimensions.addPage(100, 100);
     viewport.setDocumentDimensions(documentDimensions);
     viewport.setZoom(0.1);
     mockCallback.reset();
     viewport.fitToPage();
+    chrome.test.assertEq(Viewport.FittingType.FIT_TO_PAGE,
+                         viewport.fittingType);
     chrome.test.assertTrue(mockCallback.wasCalled);
     chrome.test.assertEq('100px', mockSizer.style.width);
     chrome.test.assertEq('100px', mockSizer.style.height);
     chrome.test.assertEq(1, viewport.zoom);
 
     // Test with a page size whose width is larger than its height.
     documentDimensions.reset();
     documentDimensions.addPage(200, 100);
     viewport.setDocumentDimensions(documentDimensions);
     mockCallback.reset();
     viewport.fitToPage();
+    chrome.test.assertEq(Viewport.FittingType.FIT_TO_PAGE,
+                         viewport.fittingType);
     chrome.test.assertTrue(mockCallback.wasCalled);
     chrome.test.assertEq('100px', mockSizer.style.width);
     chrome.test.assertEq('50px', mockSizer.style.height);
     chrome.test.assertEq(0.5, viewport.zoom);
 
     // Test with a page size whose height is larger than its width.
     documentDimensions.reset();
     documentDimensions.addPage(100, 200);
     viewport.setDocumentDimensions(documentDimensions);
     mockCallback.reset();
     viewport.fitToPage();
+    chrome.test.assertEq(Viewport.FittingType.FIT_TO_PAGE,
+                         viewport.fittingType);
     chrome.test.assertTrue(mockCallback.wasCalled);
     chrome.test.assertEq('50px', mockSizer.style.width);
     chrome.test.assertEq('100px', mockSizer.style.height);
     chrome.test.assertEq(0.5, viewport.zoom);
 
     // Test that when there are multiple pages the height of the most visible
     // page and the width of the widest page are sized to.
     documentDimensions.reset();
     documentDimensions.addPage(100, 100);
     documentDimensions.addPage(200, 400);
     viewport.setDocumentDimensions(documentDimensions);
     viewport.setZoom(1);
     mockWindow.scrollTo(0, 0);
     mockCallback.reset();
     viewport.fitToPage();
+    chrome.test.assertEq(Viewport.FittingType.FIT_TO_PAGE,
+                         viewport.fittingType);
     chrome.test.assertTrue(mockCallback.wasCalled);
     chrome.test.assertEq('100px', mockSizer.style.width);
     chrome.test.assertEq('250px', mockSizer.style.height);
     chrome.test.assertEq(0.5, viewport.zoom);
     viewport.setZoom(1);
     mockWindow.scrollTo(0, 100);
     mockCallback.reset();
     viewport.fitToPage();
     chrome.test.assertTrue(mockCallback.wasCalled);
     chrome.test.assertEq('50px', mockSizer.style.width);
     chrome.test.assertEq('125px', mockSizer.style.height);
     chrome.test.assertEq(0.25, viewport.zoom);
 
     // Test that the top of the most visible page is scrolled to.
     documentDimensions.reset();
     documentDimensions.addPage(200, 200);
     documentDimensions.addPage(100, 400);
     viewport.setDocumentDimensions(documentDimensions);
     viewport.setZoom(1);
     mockWindow.scrollTo(0, 0);
     viewport.fitToPage();
+    chrome.test.assertEq(Viewport.FittingType.FIT_TO_PAGE,
+                         viewport.fittingType);
     chrome.test.assertEq(0.5, viewport.zoom);
     chrome.test.assertEq(0, viewport.position.x);
     chrome.test.assertEq(0, viewport.position.y);
     viewport.setZoom(1);
     mockWindow.scrollTo(0, 175);
     viewport.fitToPage();
     chrome.test.assertEq(0.25, viewport.zoom);
     chrome.test.assertEq(0, viewport.position.x);
     chrome.test.assertEq(50, viewport.position.y);
 
     // Test that when the window size changes, fit-to-page occurs but does not
     // scroll to the top of the page (it should stay at the scaled scroll
     // position).
     mockWindow.scrollTo(0, 0);
     viewport.fitToPage();
+    chrome.test.assertEq(Viewport.FittingType.FIT_TO_PAGE,
+                         viewport.fittingType);
     chrome.test.assertEq(0.5, viewport.zoom);
     mockWindow.scrollTo(0, 10);
     mockWindow.setSize(50, 50);
     chrome.test.assertEq(0.25, viewport.zoom);
     chrome.test.assertEq(0, viewport.position.x);
     chrome.test.assertEq(5, viewport.position.y);
 
     chrome.test.succeed();
   },
 
@@ skipping 98 matching lines @@
         chrome.test.assertEq(1, viewport.zoom);
     };
     viewport = new Viewport(mockWindow, mockSizer, function() {},
                             beforeZoom, afterZoom, 0, 0);
     viewport.setZoom(0.5);
     chrome.test.succeed();
   }
 ];
 
 chrome.test.runTests(tests);