| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "sky/engine/config.h" | |
| 27 #include "sky/engine/platform/transforms/Matrix3DTransformOperation.h" | 26 #include "sky/engine/platform/transforms/Matrix3DTransformOperation.h" |
| 28 | 27 |
| 29 #include <algorithm> | 28 #include <algorithm> |
| 30 | 29 |
| 31 namespace blink { | 30 namespace blink { |
| 32 | 31 |
| 33 PassRefPtr<TransformOperation> Matrix3DTransformOperation::blend(const Transform
Operation* from, double progress, bool blendToIdentity) | 32 PassRefPtr<TransformOperation> Matrix3DTransformOperation::blend(const Transform
Operation* from, double progress, bool blendToIdentity) |
| 34 { | 33 { |
| 35 if (from && !from->isSameType(*this)) | 34 if (from && !from->isSameType(*this)) |
| 36 return this; | 35 return this; |
| 37 | 36 |
| 38 // Convert the TransformOperations into matrices | 37 // Convert the TransformOperations into matrices |
| 39 FloatSize size; | 38 FloatSize size; |
| 40 TransformationMatrix fromT; | 39 TransformationMatrix fromT; |
| 41 TransformationMatrix toT; | 40 TransformationMatrix toT; |
| 42 if (from) | 41 if (from) |
| 43 from->apply(fromT, size); | 42 from->apply(fromT, size); |
| 44 | 43 |
| 45 apply(toT, size); | 44 apply(toT, size); |
| 46 | 45 |
| 47 if (blendToIdentity) | 46 if (blendToIdentity) |
| 48 std::swap(fromT, toT); | 47 std::swap(fromT, toT); |
| 49 | 48 |
| 50 toT.blend(fromT, progress); | 49 toT.blend(fromT, progress); |
| 51 return Matrix3DTransformOperation::create(toT); | 50 return Matrix3DTransformOperation::create(toT); |
| 52 } | 51 } |
| 53 | 52 |
| 54 } // namespace blink | 53 } // namespace blink |
| OLD | NEW |