| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 /** | 5 /** |
| 6 * Returns the height of the intersection of two rectangles. | 6 * Returns the height of the intersection of two rectangles. |
| 7 * @param {Object} rect1 the first rect | 7 * @param {Object} rect1 the first rect |
| 8 * @param {Object} rect2 the second rect | 8 * @param {Object} rect2 the second rect |
| 9 * @return {number} the height of the intersection of the rects | 9 * @return {number} the height of the intersection of the rects |
| 10 */ | 10 */ |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 * window when these keys are pressed but in certain cases we need to simulate | 70 * window when these keys are pressed but in certain cases we need to simulate |
| 71 * these events. | 71 * these events. |
| 72 */ | 72 */ |
| 73 Viewport.SCROLL_INCREMENT = 40; | 73 Viewport.SCROLL_INCREMENT = 40; |
| 74 | 74 |
| 75 /** | 75 /** |
| 76 * Predefined zoom factors to be used when zooming in/out. These are in | 76 * Predefined zoom factors to be used when zooming in/out. These are in |
| 77 * ascending order. This should match the list in | 77 * ascending order. This should match the list in |
| 78 * components/ui/zoom/page_zoom_constants.h | 78 * components/ui/zoom/page_zoom_constants.h |
| 79 */ | 79 */ |
| 80 Viewport.ZOOM_FACTORS = [0.25, 0.333, 0.5, 0.666, 0.75, 0.9, 1, | 80 Viewport.ZOOM_FACTORS = [0.25, 1 / 3, 0.5, 2 / 3, 0.75, 0.8, 0.9, |
| 81 1.1, 1.25, 1.5, 1.75, 2, 2.5, 3, 4, 5]; | 81 1, 1.1, 1.25, 1.5, 1.75, 2, 2.5, 3, 4, 5]; |
| 82 | 82 |
| 83 /** | 83 /** |
| 84 * The minimum and maximum range to be used to clip zoom factor. | 84 * The minimum and maximum range to be used to clip zoom factor. |
| 85 */ | 85 */ |
| 86 Viewport.ZOOM_FACTOR_RANGE = { | 86 Viewport.ZOOM_FACTOR_RANGE = { |
| 87 min: Viewport.ZOOM_FACTORS[0], | 87 min: Viewport.ZOOM_FACTORS[0], |
| 88 max: Viewport.ZOOM_FACTORS[Viewport.ZOOM_FACTORS.length - 1] | 88 max: Viewport.ZOOM_FACTORS[Viewport.ZOOM_FACTORS.length - 1] |
| 89 }; | 89 }; |
| 90 | 90 |
| 91 /** | 91 /** |
| (...skipping 497 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 589 spaceOnLeft = Math.max(spaceOnLeft, 0); | 589 spaceOnLeft = Math.max(spaceOnLeft, 0); |
| 590 | 590 |
| 591 return { | 591 return { |
| 592 x: x * this.zoom_ + spaceOnLeft - this.window_.pageXOffset, | 592 x: x * this.zoom_ + spaceOnLeft - this.window_.pageXOffset, |
| 593 y: insetDimensions.y * this.zoom_ - this.window_.pageYOffset, | 593 y: insetDimensions.y * this.zoom_ - this.window_.pageYOffset, |
| 594 width: insetDimensions.width * this.zoom_, | 594 width: insetDimensions.width * this.zoom_, |
| 595 height: insetDimensions.height * this.zoom_ | 595 height: insetDimensions.height * this.zoom_ |
| 596 }; | 596 }; |
| 597 } | 597 } |
| 598 }; | 598 }; |
| OLD | NEW |