| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
| 6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
| 7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
| 8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
| 9 * | 9 * |
| 10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 #include "core/platform/graphics/transforms/RotateTransformOperation.h" | 23 #include "core/platform/graphics/transforms/RotateTransformOperation.h" |
| 24 | 24 |
| 25 #include <algorithm> | 25 #include <algorithm> |
| 26 #include "core/platform/animation/AnimationUtilities.h" | 26 #include "core/platform/animation/AnimationUtilities.h" |
| 27 #include "wtf/MathExtras.h" | 27 #include "wtf/MathExtras.h" |
| 28 | 28 |
| 29 using namespace std; | 29 using namespace std; |
| 30 | 30 |
| 31 namespace WebCore { | 31 namespace WebCore { |
| 32 | 32 |
| 33 PassRefPtr<TransformOperation> RotateTransformOperation::blend(const TransformOp
eration* from, double progress, bool blendToIdentity) | 33 PassRefPtr<TransformOperation> RotateTransformOperation::blend(const TransformOp
eration* from, double progress, bool blendToIdentity, RenderView* renderView) |
| 34 { | 34 { |
| 35 if (from && !from->isSameType(*this)) | 35 if (from && !from->isSameType(*this)) |
| 36 return this; | 36 return this; |
| 37 | 37 |
| 38 if (blendToIdentity) | 38 if (blendToIdentity) |
| 39 return RotateTransformOperation::create(m_x, m_y, m_z, m_angle - m_angle
* progress, m_type); | 39 return RotateTransformOperation::create(m_x, m_y, m_z, m_angle - m_angle
* progress, m_type); |
| 40 | 40 |
| 41 const RotateTransformOperation* fromOp = static_cast<const RotateTransformOp
eration*>(from); | 41 const RotateTransformOperation* fromOp = static_cast<const RotateTransformOp
eration*>(from); |
| 42 | 42 |
| 43 // Optimize for single axis rotation | 43 // Optimize for single axis rotation |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 angle = rad2deg(acos(decomp.quaternionW) * 2); | 87 angle = rad2deg(acos(decomp.quaternionW) * 2); |
| 88 } else { | 88 } else { |
| 89 x = 0; | 89 x = 0; |
| 90 y = 0; | 90 y = 0; |
| 91 z = 1; | 91 z = 1; |
| 92 } | 92 } |
| 93 return RotateTransformOperation::create(x, y, z, angle, Rotate3D); | 93 return RotateTransformOperation::create(x, y, z, angle, Rotate3D); |
| 94 } | 94 } |
| 95 | 95 |
| 96 } // namespace WebCore | 96 } // namespace WebCore |
| OLD | NEW |