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