Gallery: Random fixes for the Viewport class.

ui/file_manager/gallery/js/image_editor/image_transform.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.
 
 'use strict';
 
 /**
  * Crop mode.
  *
  * @extends {ImageEditor.Mode}
@@ skipping 110 matching lines @@
  */
 ImageEditor.Mode.Crop.prototype.reset = function() {
   ImageEditor.Mode.prototype.reset.call(this);
   this.createDefaultCrop();
 };
 
 /**
  * Updates the position of DOM elements.
  */
 ImageEditor.Mode.Crop.prototype.positionDOM = function() {
-  var screenClipped = this.viewport_.getScreenClipped();
+  var screenClipped = this.viewport_.getImageBoundsOnScreenClipped();
 
   var screenCrop = this.viewport_.imageToScreenRect(this.cropRect_.getRect());
   var delta = ImageEditor.Mode.Crop.MOUSE_GRAB_RADIUS;
   this.editor_.hideOverlappingTools(
       screenCrop.inflate(delta, delta),
       screenCrop.inflate(-delta, -delta));
 
   this.domOverlay_.style.left = screenClipped.left + 'px';
   this.domOverlay_.style.top = screenClipped.top + 'px';
   this.domOverlay_.style.width = screenClipped.width + 'px';
@@ skipping 41 matching lines @@
  */
 ImageEditor.Mode.Crop.prototype.getCommand = function() {
   var cropImageRect = this.cropRect_.getRect();
   return new Command.Crop(cropImageRect);
 };
 
 /**
  * Creates default (initial) crop.
  */
 ImageEditor.Mode.Crop.prototype.createDefaultCrop = function() {
-  var rect = new Rect(this.getViewport().getImageClipped());
+  var rect = this.getViewport().screenToImageRect(
+      new Rect(this.getViewport().getImageBoundsOnScreenClipped()));
   rect = rect.inflate(
       -Math.round(rect.width / 6), -Math.round(rect.height / 6));
   this.cropRect_ = new DraggableRect(rect, this.getViewport());
   this.positionDOM();
 };
 
 /**
  * Obtains the cursor style depending on the mouse state.
  *
  * @param {number} x X coordinate for cursor.
@@ skipping 254 matching lines @@
  * @return {function(number,number,boolean)} Drag handler that takes x
  *     coordinate value, y coordinate value, and shift key flag.
  */
 DraggableRect.prototype.getDragHandler = function(
     initialScreenX, initialScreenY, touch) {
   // Check if the initial coordinate in the clip rect.
   var initialX = this.viewport_.screenToImageX(initialScreenX);
   var initialY = this.viewport_.screenToImageY(initialScreenY);
   var initialWidth = this.bounds_.right - this.bounds_.left;
   var initialHeight = this.bounds_.bottom - this.bounds_.top;
-  var clipRect = this.viewport_.getImageClipped();
+  var clipRect = this.viewport_.screenToImageRect(
+      this.viewport_.getImageBoundsOnScreenClipped());
   if (!clipRect.inside(initialX, initialY))
     return null;
 
   // Obtain the drag mode.
   this.dragMode_ = this.getDragMode(initialX, initialY, touch);
 
   if (this.dragMode_.whole) {
     // Calc constant values during the operation.
     var mouseBiasX = this.bounds_.left - initialX;
     var mouseBiasY = this.bounds_.top - initialY;
@@ skipping 71 matching lines @@
 
 /**
  * Obtains double tap action depending on the coordinate.
  *
  * @param {number} x X coordinate for cursor.
  * @param {number} y Y coordinate for cursor.
  * @param {boolean} touch Whether the operation is done by touch or not.
  * @return {ImageBuffer.DoubleTapAction} Double tap action.
  */
 DraggableRect.prototype.getDoubleTapAction = function(x, y, touch) {
-  x = this.viewport_.screenToImageX(x);
-  y = this.viewport_.screenToImageY(y);
-
-  var clipRect = this.viewport_.getImageClipped();
+  var clipRect = this.viewport_.getImageBoundsOnScreenClipped();
   if (clipRect.inside(x, y))
     return ImageBuffer.DoubleTapAction.COMMIT;
   else
     return ImageBuffer.DoubleTapAction.NOTHING;
 };
 
 /**
  * Forces the aspect ratio.
  *
  * @param {number} aspectRatio Aspect ratio.
@@ skipping 70 matching lines @@
       break;
     case 'bottom':
       this.bounds_.bottom = this.bounds_.top + newHeight;
       break;
     case 'none':
       this.bounds_.top = middle - newHeight / 2;
       this.bounds_.bottom = middle + newHeight / 2;
       break;
   }
 };