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

Side by Side Diff: sky/engine/platform/transforms/MatrixTransformOperation.cpp

Issue 1206763002: Really remove config.h (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 6 months 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) 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,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Library General Public License for more details. 13 * Library General Public License for more details.
14 * 14 *
15 * You should have received a copy of the GNU Library General Public License 15 * You should have received a copy of the GNU Library General Public License
16 * along with this library; see the file COPYING.LIB. If not, write to 16 * along with this library; see the file COPYING.LIB. If not, write to
17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
18 * Boston, MA 02110-1301, USA. 18 * Boston, MA 02110-1301, USA.
19 * 19 *
20 */ 20 */
21 21
22 #include "sky/engine/config.h"
23 #include "sky/engine/platform/transforms/MatrixTransformOperation.h" 22 #include "sky/engine/platform/transforms/MatrixTransformOperation.h"
24 23
25 #include <algorithm> 24 #include <algorithm>
26 25
27 namespace blink { 26 namespace blink {
28 27
29 PassRefPtr<TransformOperation> MatrixTransformOperation::blend(const TransformOp eration* from, double progress, bool blendToIdentity) 28 PassRefPtr<TransformOperation> MatrixTransformOperation::blend(const TransformOp eration* from, double progress, bool blendToIdentity)
30 { 29 {
31 if (from && !from->isSameType(*this)) 30 if (from && !from->isSameType(*this))
32 return this; 31 return this;
33 32
34 // convert the TransformOperations into matrices 33 // convert the TransformOperations into matrices
35 FloatSize size; 34 FloatSize size;
36 TransformationMatrix fromT; 35 TransformationMatrix fromT;
37 TransformationMatrix toT(m_a, m_b, m_c, m_d, m_e, m_f); 36 TransformationMatrix toT(m_a, m_b, m_c, m_d, m_e, m_f);
38 if (from) { 37 if (from) {
39 const MatrixTransformOperation* m = static_cast<const MatrixTransformOpe ration*>(from); 38 const MatrixTransformOperation* m = static_cast<const MatrixTransformOpe ration*>(from);
40 fromT.setMatrix(m->m_a, m->m_b, m->m_c, m->m_d, m->m_e, m->m_f); 39 fromT.setMatrix(m->m_a, m->m_b, m->m_c, m->m_d, m->m_e, m->m_f);
41 } 40 }
42 41
43 if (blendToIdentity) 42 if (blendToIdentity)
44 std::swap(fromT, toT); 43 std::swap(fromT, toT);
45 44
46 toT.blend(fromT, progress); 45 toT.blend(fromT, progress);
47 return MatrixTransformOperation::create(toT.a(), toT.b(), toT.c(), toT.d(), toT.e(), toT.f()); 46 return MatrixTransformOperation::create(toT.a(), toT.b(), toT.c(), toT.d(), toT.e(), toT.f());
48 } 47 }
49 48
50 } // namespace blink 49 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698