Revert 283225 "Hookup the PDF extension to the chrome extensions..."

trunk/src/chrome/browser/resources/pdf/viewport.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.
 
 /**
  * Returns the area of the intersection of two rectangles.
  * @param {Object} rect1 the first rect
  * @param {Object} rect2 the second rect
  * @return {number} the area of the intersection of the rects
  */
@@ skipping 188 matching lines @@
     f();
     this.allowedToChangeZoom_ = false;
     this.afterZoomCallback_();
   },
 
   /**
    * @private
    * Sets the zoom of the viewport.
    * @param {number} newZoom the zoom level to zoom to.
    */
-  setZoomInternal_: function(newZoom) {
-    if (!this.allowedToChangeZoom_) {
-      throw 'Called Viewport.setZoomInternal_ without calling ' +
-            'Viewport.mightZoom_.';
-    }
+  setZoom_: function(newZoom) {
+    if (!this.allowedToChangeZoom_)
+      throw 'Called Viewport.setZoom_ without calling Viewport.mightZoom_.';
     var oldZoom = this.zoom_;
     this.zoom_ = newZoom;
     // Record the scroll position (relative to the middle of the window).
     var currentScrollPos = [
       (this.window_.pageXOffset + this.window_.innerWidth / 2) / oldZoom,
       (this.window_.pageYOffset + this.window_.innerHeight / 2) / oldZoom
     ];
     this.contentSizeChanged_();
     // Scroll to the scaled scroll position.
     this.window_.scrollTo(
         currentScrollPos[0] * newZoom - this.window_.innerWidth / 2,
         currentScrollPos[1] * newZoom - this.window_.innerHeight / 2);
   },
 
   /**
-   * Sets the zoom to the given zoom level.
-   * @param {number} newZoom the zoom level to zoom to.
+   * @private
+   * Sets the zoom for testing purposes.
    */
-  setZoom: function(newZoom) {
+  setZoomForTest_: function(newZoom) {
     this.mightZoom_(function() {
-      this.setZoomInternal_(newZoom);
-      this.updateViewport_();
+      this.setZoom_(newZoom);
     }.bind(this));
   },
 
   /**
    * @type {number} the width of scrollbars in the viewport in pixels.
    */
   get scrollbarWidth() {
     return this.scrollbarWidth_;
   },
 
@@ skipping 131 matching lines @@
    */
   fitToWidth: function() {
     this.mightZoom_(function() {
       this.fittingType_ = Viewport.FittingType.FIT_TO_WIDTH;
       if (!this.documentDimensions_)
         return;
       // Track the last y-position to stay at the same position after zooming.
       var oldY = this.window_.pageYOffset / this.zoom_;
       // When computing fit-to-width, the maximum width of a page in the
       // document is used, which is equal to the size of the document width.
-      this.setZoomInternal_(this.computeFittingZoom_(this.documentDimensions_,
-                                                     true));
+      this.setZoom_(this.computeFittingZoom_(this.documentDimensions_, true));
       var page = this.getMostVisiblePage();
       this.window_.scrollTo(0, oldY * this.zoom_);
       this.updateViewport_();
     }.bind(this));
   },
 
   /**
    * Zoom the viewport so that a page consumes the entire viewport. Also scrolls
    * to the top of the most visible page.
    */
   fitToPage: function() {
     this.mightZoom_(function() {
       this.fittingType_ = Viewport.FittingType.FIT_TO_PAGE;
       if (!this.documentDimensions_)
         return;
       var page = this.getMostVisiblePage();
-      this.setZoomInternal_(this.computeFittingZoom_(
+      this.setZoom_(this.computeFittingZoom_(
           this.pageDimensions_[page], false));
       // Center the document in the page by scrolling by the amount of empty
       // space to the left of the document.
       var xOffset =
           (this.documentDimensions_.width - this.pageDimensions_[page].width) *
           this.zoom_ / 2;
       this.window_.scrollTo(xOffset,
                             this.pageDimensions_[page].y * this.zoom_);
       this.updateViewport_();
     }.bind(this));
   },
 
   /**
    * Zoom out to the next predefined zoom level.
    */
   zoomOut: function() {
     this.mightZoom_(function() {
       this.fittingType_ = Viewport.FittingType.NONE;
       var nextZoom = Viewport.ZOOM_FACTORS[0];
       for (var i = 0; i < Viewport.ZOOM_FACTORS.length; i++) {
         if (Viewport.ZOOM_FACTORS[i] < this.zoom_)
           nextZoom = Viewport.ZOOM_FACTORS[i];
       }
-      this.setZoomInternal_(nextZoom);
+      this.setZoom_(nextZoom);
       this.updateViewport_();
     }.bind(this));
   },
 
   /**
    * Zoom in to the next predefined zoom level.
    */
   zoomIn: function() {
     this.mightZoom_(function() {
       this.fittingType_ = Viewport.FittingType.NONE;
       var nextZoom = Viewport.ZOOM_FACTORS[Viewport.ZOOM_FACTORS.length - 1];
       for (var i = Viewport.ZOOM_FACTORS.length - 1; i >= 0; i--) {
         if (Viewport.ZOOM_FACTORS[i] > this.zoom_)
           nextZoom = Viewport.ZOOM_FACTORS[i];
       }
-      this.setZoomInternal_(nextZoom);
+      this.setZoom_(nextZoom);
       this.updateViewport_();
     }.bind(this));
   },
 
   /**
    * Go to the given page index.
    * @param {number} page the index of the page to go to.
    */
   goToPage: function(page) {
     this.mightZoom_(function() {
@@ skipping 13 matching lines @@
   /**
    * Set the dimensions of the document.
    * @param {Object} documentDimensions the dimensions of the document
    */
   setDocumentDimensions: function(documentDimensions) {
     this.mightZoom_(function() {
       var initialDimensions = !this.documentDimensions_;
       this.documentDimensions_ = documentDimensions;
       this.pageDimensions_ = this.documentDimensions_.pageDimensions;
       if (initialDimensions) {
-        this.setZoomInternal_(this.computeFittingZoom_(this.documentDimensions_,
-                                                       true));
+        this.setZoom_(this.computeFittingZoom_(this.documentDimensions_, true));
         if (this.zoom_ > 1)
-          this.setZoomInternal_(1);
+          this.setZoom_(1);
         this.window_.scrollTo(0, 0);
       }
       this.contentSizeChanged_();
       this.resize_();
     }.bind(this));
   },
 
   /**
    * Get the coordinates of the page contents (excluding the page shadow)
    * relative to the screen.
@@ skipping 36 matching lines @@
     spaceOnLeft = Math.max(spaceOnLeft, 0);
 
     return {
       x: x * this.zoom_ + spaceOnLeft - this.window_.pageXOffset,
       y: insetDimensions.y * this.zoom_ - this.window_.pageYOffset,
       width: insetDimensions.width * this.zoom_,
       height: insetDimensions.height * this.zoom_
     };
   }
 };