Revert of Add a scroll offset to PDF documents to account for the top material design toolbar.

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, 1, 0);
+                     function() {}, function() {}, 10, 1);
     var scrollbars;
 
     viewport.setDocumentDimensions(new MockDocumentDimensions(90, 90));
     scrollbars = viewport.documentNeedsScrollbars_(1);
     chrome.test.assertFalse(scrollbars.vertical);
     chrome.test.assertFalse(scrollbars.horizontal);
 
     viewport.setDocumentDimensions(new MockDocumentDimensions(100, 100));
     scrollbars = viewport.documentNeedsScrollbars_(1);
     chrome.test.assertFalse(scrollbars.vertical);
@@ skipping 34 matching lines @@
     chrome.test.assertTrue(scrollbars.vertical);
     chrome.test.assertFalse(scrollbars.horizontal);
     chrome.test.succeed();
   },
 
   function testSetZoom() {
     var mockSizer = new MockSizer();
     var mockWindow = new MockWindow(100, 100, mockSizer);
     var mockCallback = new MockViewportChangedCallback();
     var viewport = new Viewport(mockWindow, mockSizer, mockCallback.callback,
-                                function() {}, function() {}, 0, 1, 0);
+                                function() {}, function() {}, 0, 1);
 
     // Test setting the zoom without the document dimensions set. The sizer
     // shouldn't change size.
     mockCallback.reset();
     viewport.setZoom(0.5);
     chrome.test.assertEq(0.5, viewport.zoom);
     chrome.test.assertTrue(mockCallback.wasCalled);
     chrome.test.assertEq('0px', mockSizer.style.width);
     chrome.test.assertEq('0px', mockSizer.style.height);
     chrome.test.assertEq(0, mockWindow.pageXOffset);
@@ skipping 54 matching lines @@
     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, 1, 0);
+                                function() {}, function() {}, 0, 1);
 
     var documentDimensions = new MockDocumentDimensions(100, 100);
     documentDimensions.addPage(50, 100);
     documentDimensions.addPage(100, 100);
     documentDimensions.addPage(100, 200);
     viewport.setDocumentDimensions(documentDimensions);
     viewport.setZoom(1);
 
     // Scrolled to the start of the first page.
     mockWindow.scrollTo(0, 0);
@@ skipping 29 matching lines @@
     mockWindow.scrollTo(0, 0);
     chrome.test.assertEq(0, viewport.getMostVisiblePage());
     chrome.test.succeed();
   },
 
   function testFitToWidth() {
     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, 1, 0);
+                                function() {}, function() {}, 0, 1);
     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);
@@ skipping 38 matching lines @@
                          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, 1, 0);
+                            function() {}, function() {}, 15, 1);
     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, 1, 0);
+                                function() {}, function() {}, 0, 1);
     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);
@@ skipping 88 matching lines @@
     chrome.test.assertEq(5, viewport.position.y);
 
     chrome.test.succeed();
   },
 
   function testGoToPage() {
     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, 1, 0);
+                                function() {}, function() {}, 0, 1);
     var documentDimensions = new MockDocumentDimensions();
 
     documentDimensions.addPage(100, 100);
     documentDimensions.addPage(200, 200);
     documentDimensions.addPage(100, 400);
     viewport.setDocumentDimensions(documentDimensions);
     viewport.setZoom(1);
 
     mockCallback.reset();
     viewport.goToPage(0);
@@ skipping 20 matching lines @@
     chrome.test.assertEq(0, viewport.position.x);
     chrome.test.assertEq(150, viewport.position.y);
     chrome.test.succeed();
   },
 
   function testGetPageScreenRect() {
     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, 1, 0);
+                                function() {}, function() {}, 0, 1);
     var documentDimensions = new MockDocumentDimensions();
     documentDimensions.addPage(100, 100);
     documentDimensions.addPage(200, 200);
     viewport.setDocumentDimensions(documentDimensions);
     viewport.setZoom(1);
 
     // Test that the rect of the first page is positioned/sized correctly.
     mockWindow.scrollTo(0, 0);
     var rect1 = viewport.getPageScreenRect(0);
     chrome.test.assertEq(Viewport.PAGE_SHADOW.left + 100 / 2, rect1.x);
@@ skipping 34 matching lines @@
         afterZoomCalled = true;
         chrome.test.assertTrue(beforeZoomCalled);
         chrome.test.assertEq(0.5, viewport.zoom);
     };
     var beforeZoom = function() {
         beforeZoomCalled = true;
         chrome.test.assertFalse(afterZoomCalled);
         chrome.test.assertEq(1, viewport.zoom);
     };
     viewport = new Viewport(mockWindow, mockSizer, function() {},
-                            beforeZoom, afterZoom, 0, 1, 0);
+                            beforeZoom, afterZoom, 0, 1);
     viewport.setZoom(0.5);
     chrome.test.succeed();
   },
 
   function testInitialSetDocumentDimensionsZoomConstrained() {
     var viewport =
         new Viewport(new MockWindow(100, 100), new MockSizer(), function() {},
-                     function() {}, function() {}, 0, 1.2, 0);
+                     function() {}, function() {}, 0, 1.2);
     viewport.setDocumentDimensions(new MockDocumentDimensions(50, 50));
     chrome.test.assertEq(1.2, viewport.zoom);
     chrome.test.succeed();
   },
 
   function testInitialSetDocumentDimensionsZoomUnconstrained() {
     var viewport = new Viewport(
         new MockWindow(100, 100),
-        new MockSizer(), function() {}, function() {}, function() {}, 0, 3, 0);
+        new MockSizer(), function() {}, function() {}, function() {}, 0, 3);
     viewport.setDocumentDimensions(new MockDocumentDimensions(50, 50));
     chrome.test.assertEq(2, viewport.zoom);
     chrome.test.succeed();
   },
-
-  function testToolbarHeightOffset() {
-    var mockSizer = new MockSizer();
-    var mockWindow = new MockWindow(100, 100);
-    var viewport = new Viewport(mockWindow,
-        mockSizer, function() {}, function() {}, function() {}, 0, 1, 50);
-    var documentDimensions = new MockDocumentDimensions(0, 0);
-    documentDimensions.addPage(50, 500);
-    viewport.setDocumentDimensions(documentDimensions);
-    viewport.setZoom(1);
-
-    // Check that the sizer incorporates the toolbar height.
-    chrome.test.assertEq('550px', mockSizer.style.height);
-    chrome.test.assertEq('50px', mockSizer.style.width);
-    chrome.test.assertEq(0, viewport.position.x);
-
-    // Check the sizer incorporates the toolbar height correctly even if zoomed.
-    viewport.setZoom(2);
-    chrome.test.assertEq('1050px', mockSizer.style.height);
-    chrome.test.assertEq('100px', mockSizer.style.width);
-
-    // Test that the viewport scrolls to the correct offset when fit-to-page is
-    // enabled. The top of the viewport should be at the start of the document.
-    viewport.fitToPage();
-    chrome.test.assertEq(0, viewport.position.y);
-
-    // Check that going to a page scrolls to the correct offset when fit-to-page
-    // is enabled. The top of the viewport should be at the start of the
-    // document.
-    mockWindow.scrollTo(0, 100);
-    viewport.goToPage(0);
-    chrome.test.assertEq(0, viewport.position.y);
-
-    // Check that going to a page scrolls to the correct offset when fit-to-page
-    // is not enabled. The top of the viewport should be before start of the
-    // document.
-    viewport.setZoom(1);
-    viewport.goToPage(0);
-    chrome.test.assertEq(-50, viewport.position.y);
-    chrome.test.succeed();
-  }
 ];
 
 chrome.test.runTests(tests);