| 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 * The overlay displaying the image. | 6 * The overlay displaying the image. |
| 7 * | 7 * |
| 8 * @param {!HTMLElement} container The container element. | 8 * @param {!HTMLElement} container The container element. |
| 9 * @param {!Viewport} viewport The viewport. | 9 * @param {!Viewport} viewport The viewport. |
| 10 * @param {!MetadataModel} metadataModel | 10 * @param {!MetadataModel} metadataModel |
| (...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 637 if (oldScreenImage) | 637 if (oldScreenImage) |
| 638 ImageUtil.setAttribute(newScreenImage, 'fade', true); | 638 ImageUtil.setAttribute(newScreenImage, 'fade', true); |
| 639 this.setTransform_( | 639 this.setTransform_( |
| 640 newScreenImage, this.viewport_, opt_effect, 0 /* instant */); | 640 newScreenImage, this.viewport_, opt_effect, 0 /* instant */); |
| 641 | 641 |
| 642 setTimeout(function() { | 642 setTimeout(function() { |
| 643 this.setTransform_( | 643 this.setTransform_( |
| 644 newScreenImage, | 644 newScreenImage, |
| 645 this.viewport_, | 645 this.viewport_, |
| 646 null, | 646 null, |
| 647 opt_effect && opt_effect.getDuration()); | 647 opt_effect ? opt_effect.getDuration() : undefined); |
| 648 if (oldScreenImage) { | 648 if (oldScreenImage) { |
| 649 ImageUtil.setAttribute(newScreenImage, 'fade', false); | 649 ImageUtil.setAttribute(newScreenImage, 'fade', false); |
| 650 ImageUtil.setAttribute(oldScreenImage, 'fade', true); | 650 ImageUtil.setAttribute(oldScreenImage, 'fade', true); |
| 651 var reverse = opt_effect.getReverse(); | 651 var reverse = opt_effect.getReverse(); |
| 652 if (reverse) { | 652 if (reverse) { |
| 653 this.setTransform_(oldScreenImage, oldViewport, reverse); | 653 this.setTransform_(oldScreenImage, oldViewport, reverse); |
| 654 setTimeout(function() { | 654 setTimeout(function() { |
| 655 if (oldScreenImage.parentNode) | 655 if (oldScreenImage.parentNode) |
| 656 oldScreenImage.parentNode.removeChild(oldScreenImage); | 656 oldScreenImage.parentNode.removeChild(oldScreenImage); |
| 657 }, reverse.getSafeInterval()); | 657 }, reverse.getSafeInterval()); |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 967 }; | 967 }; |
| 968 | 968 |
| 969 ImageView.Effect.Rotate.prototype = { __proto__: ImageView.Effect.prototype }; | 969 ImageView.Effect.Rotate.prototype = { __proto__: ImageView.Effect.prototype }; |
| 970 | 970 |
| 971 /** | 971 /** |
| 972 * @override | 972 * @override |
| 973 */ | 973 */ |
| 974 ImageView.Effect.Rotate.prototype.transform = function(element, viewport) { | 974 ImageView.Effect.Rotate.prototype.transform = function(element, viewport) { |
| 975 return viewport.getInverseTransformForRotatedImage(this.orientation_); | 975 return viewport.getInverseTransformForRotatedImage(this.orientation_); |
| 976 }; | 976 }; |
| OLD | NEW |