| 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 13 matching lines...) Expand all Loading... |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 #include "platform/transforms/PerspectiveTransformOperation.h" | 27 #include "platform/transforms/PerspectiveTransformOperation.h" |
| 28 | 28 |
| 29 #include "platform/animation/AnimationUtilities.h" | 29 #include "platform/animation/AnimationUtilities.h" |
| 30 #include "wtf/MathExtras.h" | 30 #include "wtf/MathExtras.h" |
| 31 | 31 |
| 32 using namespace std; | 32 using namespace std; |
| 33 | 33 |
| 34 namespace WebCore { | 34 namespace blink { |
| 35 | 35 |
| 36 PassRefPtr<TransformOperation> PerspectiveTransformOperation::blend(const Transf
ormOperation* from, double progress, bool blendToIdentity) | 36 PassRefPtr<TransformOperation> PerspectiveTransformOperation::blend(const Transf
ormOperation* from, double progress, bool blendToIdentity) |
| 37 { | 37 { |
| 38 if (from && !from->isSameType(*this)) | 38 if (from && !from->isSameType(*this)) |
| 39 return this; | 39 return this; |
| 40 | 40 |
| 41 if (blendToIdentity) { | 41 if (blendToIdentity) { |
| 42 double p = WebCore::blend(m_p, 1., progress); // FIXME: this seems wrong
. https://bugs.webkit.org/show_bug.cgi?id=52700 | 42 double p = blink::blend(m_p, 1., progress); // FIXME: this seems wrong.
https://bugs.webkit.org/show_bug.cgi?id=52700 |
| 43 return PerspectiveTransformOperation::create(clampToPositiveInteger(p)); | 43 return PerspectiveTransformOperation::create(clampToPositiveInteger(p)); |
| 44 } | 44 } |
| 45 | 45 |
| 46 const PerspectiveTransformOperation* fromOp = static_cast<const PerspectiveT
ransformOperation*>(from); | 46 const PerspectiveTransformOperation* fromOp = static_cast<const PerspectiveT
ransformOperation*>(from); |
| 47 | 47 |
| 48 TransformationMatrix fromT; | 48 TransformationMatrix fromT; |
| 49 TransformationMatrix toT; | 49 TransformationMatrix toT; |
| 50 fromT.applyPerspective(fromOp ? fromOp->m_p : 0); | 50 fromT.applyPerspective(fromOp ? fromOp->m_p : 0); |
| 51 toT.applyPerspective(m_p); | 51 toT.applyPerspective(m_p); |
| 52 toT.blend(fromT, progress); | 52 toT.blend(fromT, progress); |
| 53 TransformationMatrix::DecomposedType decomp; | 53 TransformationMatrix::DecomposedType decomp; |
| 54 toT.decompose(decomp); | 54 toT.decompose(decomp); |
| 55 | 55 |
| 56 if (decomp.perspectiveZ) { | 56 if (decomp.perspectiveZ) { |
| 57 double val = -1.0 / decomp.perspectiveZ; | 57 double val = -1.0 / decomp.perspectiveZ; |
| 58 return PerspectiveTransformOperation::create(clampToPositiveInteger(val)
); | 58 return PerspectiveTransformOperation::create(clampToPositiveInteger(val)
); |
| 59 } | 59 } |
| 60 return PerspectiveTransformOperation::create(0); | 60 return PerspectiveTransformOperation::create(0); |
| 61 } | 61 } |
| 62 | 62 |
| 63 } // namespace WebCore | 63 } // namespace blink |
| OLD | NEW |