| 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 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 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 "config.h" | 26 #include "config.h" |
| 27 #include "platform/transforms/Matrix3DTransformOperation.h" | 27 #include "platform/transforms/Matrix3DTransformOperation.h" |
| 28 | 28 |
| 29 #include <algorithm> | 29 #include <algorithm> |
| 30 | 30 |
| 31 using namespace std; | |
| 32 | |
| 33 namespace blink { | 31 namespace blink { |
| 34 | 32 |
| 35 PassRefPtr<TransformOperation> Matrix3DTransformOperation::blend(const Transform
Operation* from, double progress, bool blendToIdentity) | 33 PassRefPtr<TransformOperation> Matrix3DTransformOperation::blend(const Transform
Operation* from, double progress, bool blendToIdentity) |
| 36 { | 34 { |
| 37 if (from && !from->isSameType(*this)) | 35 if (from && !from->isSameType(*this)) |
| 38 return this; | 36 return this; |
| 39 | 37 |
| 40 // Convert the TransformOperations into matrices | 38 // Convert the TransformOperations into matrices |
| 41 FloatSize size; | 39 FloatSize size; |
| 42 TransformationMatrix fromT; | 40 TransformationMatrix fromT; |
| 43 TransformationMatrix toT; | 41 TransformationMatrix toT; |
| 44 if (from) | 42 if (from) |
| 45 from->apply(fromT, size); | 43 from->apply(fromT, size); |
| 46 | 44 |
| 47 apply(toT, size); | 45 apply(toT, size); |
| 48 | 46 |
| 49 if (blendToIdentity) | 47 if (blendToIdentity) |
| 50 std::swap(fromT, toT); | 48 std::swap(fromT, toT); |
| 51 | 49 |
| 52 toT.blend(fromT, progress); | 50 toT.blend(fromT, progress); |
| 53 return Matrix3DTransformOperation::create(toT); | 51 return Matrix3DTransformOperation::create(toT); |
| 54 } | 52 } |
| 55 | 53 |
| 56 } // namespace blink | 54 } // namespace blink |
| OLD | NEW |