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

Side by Side Diff: cc/test/animation_test_common.cc

Issue 11308153: Migrate most of cc/ from WebKit::WebTransformationMatrix to gfx::Transform (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased to tip of tree and addressed feedback Created 8 years 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/test/animation_test_common.h" 5 #include "cc/test/animation_test_common.h"
6 6
7 #include "cc/keyframed_animation_curve.h" 7 #include "cc/keyframed_animation_curve.h"
8 #include "cc/layer.h" 8 #include "cc/layer.h"
9 #include "cc/layer_animation_controller.h" 9 #include "cc/layer_animation_controller.h"
10 #include "cc/layer_impl.h" 10 #include "cc/layer_impl.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 void FakeLayerAnimationControllerClient::setOpacityFromAnimation(float opacity) 167 void FakeLayerAnimationControllerClient::setOpacityFromAnimation(float opacity)
168 { 168 {
169 m_opacity = opacity; 169 m_opacity = opacity;
170 } 170 }
171 171
172 float FakeLayerAnimationControllerClient::opacity() const 172 float FakeLayerAnimationControllerClient::opacity() const
173 { 173 {
174 return m_opacity; 174 return m_opacity;
175 } 175 }
176 176
177 void FakeLayerAnimationControllerClient::setTransformFromAnimation(const WebKit: :WebTransformationMatrix& transform) 177 void FakeLayerAnimationControllerClient::setTransformFromAnimation(const gfx::Tr ansform& transform)
178 { 178 {
179 m_transform = transform; 179 m_transform = transform;
180 } 180 }
181 181
182 const WebKit::WebTransformationMatrix& FakeLayerAnimationControllerClient::trans form() const 182 const gfx::Transform& FakeLayerAnimationControllerClient::transform() const
183 { 183 {
184 return m_transform; 184 return m_transform;
185 } 185 }
186 186
187 scoped_ptr<cc::AnimationCurve> FakeFloatTransition::clone() const 187 scoped_ptr<cc::AnimationCurve> FakeFloatTransition::clone() const
188 { 188 {
189 return make_scoped_ptr(new FakeFloatTransition(*this)).PassAs<cc::AnimationC urve>(); 189 return make_scoped_ptr(new FakeFloatTransition(*this)).PassAs<cc::AnimationC urve>();
190 } 190 }
191 191
192 int addOpacityTransitionToController(cc::LayerAnimationController& controller, d ouble duration, float startOpacity, float endOpacity, bool useTimingFunction) 192 int addOpacityTransitionToController(cc::LayerAnimationController& controller, d ouble duration, float startOpacity, float endOpacity, bool useTimingFunction)
(...skipping 20 matching lines...) Expand all
213 { 213 {
214 return addAnimatedTransform(layer, duration, deltaX, deltaY); 214 return addAnimatedTransform(layer, duration, deltaX, deltaY);
215 } 215 }
216 216
217 int addAnimatedTransformToLayer(cc::LayerImpl& layer, double duration, int delta X, int deltaY) 217 int addAnimatedTransformToLayer(cc::LayerImpl& layer, double duration, int delta X, int deltaY)
218 { 218 {
219 return addAnimatedTransform(*layer.layerAnimationController(), duration, del taX, deltaY); 219 return addAnimatedTransform(*layer.layerAnimationController(), duration, del taX, deltaY);
220 } 220 }
221 221
222 } // namespace WebKitTests 222 } // namespace WebKitTests
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698