Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side Diff: Source/platform/transforms/Matrix3DTransformOperation.cpp

Issue 45553002: Move remaining classes in graphics/transforms to platform/ (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix merge problem Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 "config.h" 26 #include "config.h"
27 #include "core/platform/graphics/transforms/Matrix3DTransformOperation.h" 27 #include "platform/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)
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);
46 46
47 apply(toT, size); 47 apply(toT, size);
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
OLDNEW
« no previous file with comments | « Source/platform/transforms/Matrix3DTransformOperation.h ('k') | Source/platform/transforms/MatrixTransformOperation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698