| 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 * @constructor | 10 * @constructor |
| (...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 646 setTimeout(function() { | 646 setTimeout(function() { |
| 647 this.setTransform_( | 647 this.setTransform_( |
| 648 newScreenImage, | 648 newScreenImage, |
| 649 this.viewport_, | 649 this.viewport_, |
| 650 null, | 650 null, |
| 651 opt_effect && opt_effect.getDuration()); | 651 opt_effect && opt_effect.getDuration()); |
| 652 if (oldScreenImage) { | 652 if (oldScreenImage) { |
| 653 ImageUtil.setAttribute(newScreenImage, 'fade', false); | 653 ImageUtil.setAttribute(newScreenImage, 'fade', false); |
| 654 ImageUtil.setAttribute(oldScreenImage, 'fade', true); | 654 ImageUtil.setAttribute(oldScreenImage, 'fade', true); |
| 655 var reverse = opt_effect.getReverse(); | 655 var reverse = opt_effect.getReverse(); |
| 656 assert(reverse); | 656 if (reverse) { |
| 657 this.setTransform_(oldScreenImage, oldViewport, reverse); | 657 this.setTransform_(oldScreenImage, oldViewport, reverse); |
| 658 setTimeout(function() { | 658 setTimeout(function() { |
| 659 if (oldScreenImage.parentNode) |
| 660 oldScreenImage.parentNode.removeChild(oldScreenImage); |
| 661 }, reverse.getSafeInterval()); |
| 662 } else { |
| 659 if (oldScreenImage.parentNode) | 663 if (oldScreenImage.parentNode) |
| 660 oldScreenImage.parentNode.removeChild(oldScreenImage); | 664 oldScreenImage.parentNode.removeChild(oldScreenImage); |
| 661 }, reverse.getSafeInterval()); | 665 } |
| 662 } | 666 } |
| 663 }.bind(this), 0); | 667 }.bind(this), 0); |
| 664 }; | 668 }; |
| 665 | 669 |
| 666 /** | 670 /** |
| 667 * @param {!HTMLCanvasElement} element The element to transform. | 671 * @param {!HTMLCanvasElement} element The element to transform. |
| 668 * @param {!Viewport} viewport Viewport to be used for calculating | 672 * @param {!Viewport} viewport Viewport to be used for calculating |
| 669 * transformation. | 673 * transformation. |
| 670 * @param {ImageView.Effect=} opt_effect The effect to apply. | 674 * @param {ImageView.Effect=} opt_effect The effect to apply. |
| 671 * @param {number=} opt_duration Transition duration. | 675 * @param {number=} opt_duration Transition duration. |
| (...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 967 }; | 971 }; |
| 968 | 972 |
| 969 ImageView.Effect.Rotate.prototype = { __proto__: ImageView.Effect.prototype }; | 973 ImageView.Effect.Rotate.prototype = { __proto__: ImageView.Effect.prototype }; |
| 970 | 974 |
| 971 /** | 975 /** |
| 972 * @override | 976 * @override |
| 973 */ | 977 */ |
| 974 ImageView.Effect.Rotate.prototype.transform = function(element, viewport) { | 978 ImageView.Effect.Rotate.prototype.transform = function(element, viewport) { |
| 975 return viewport.getInverseTransformForRotatedImage(this.orientation_); | 979 return viewport.getInverseTransformForRotatedImage(this.orientation_); |
| 976 }; | 980 }; |
| OLD | NEW |