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

Side by Side Diff: webkit/compositor_bindings/WebTransformAnimationCurveImpl.cpp

Issue 11091057: [cc] Use base ptr types for cc's CSS animation classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Ternary => if statement Created 8 years, 2 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 | 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 "config.h" 5 #include "config.h"
6 6
7 #include "WebTransformAnimationCurveImpl.h" 7 #include "WebTransformAnimationCurveImpl.h"
8 8
9 #include "CCKeyframedAnimationCurve.h" 9 #include "CCKeyframedAnimationCurve.h"
10 #include "CCTimingFunction.h" 10 #include "CCTimingFunction.h"
(...skipping 27 matching lines...) Expand all
38 add(keyframe, TimingFunctionTypeEase); 38 add(keyframe, TimingFunctionTypeEase);
39 } 39 }
40 40
41 void WebTransformAnimationCurveImpl::add(const WebTransformKeyframe& keyframe, T imingFunctionType type) 41 void WebTransformAnimationCurveImpl::add(const WebTransformKeyframe& keyframe, T imingFunctionType type)
42 { 42 {
43 m_curve->addKeyframe(cc::CCTransformKeyframe::create(keyframe.time, keyframe .value, createTimingFunction(type))); 43 m_curve->addKeyframe(cc::CCTransformKeyframe::create(keyframe.time, keyframe .value, createTimingFunction(type)));
44 } 44 }
45 45
46 void WebTransformAnimationCurveImpl::add(const WebTransformKeyframe& keyframe, d ouble x1, double y1, double x2, double y2) 46 void WebTransformAnimationCurveImpl::add(const WebTransformKeyframe& keyframe, d ouble x1, double y1, double x2, double y2)
47 { 47 {
48 m_curve->addKeyframe(cc::CCTransformKeyframe::create(keyframe.time, keyframe .value, cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2))); 48 m_curve->addKeyframe(cc::CCTransformKeyframe::create(keyframe.time, keyframe .value, cc::CCCubicBezierTimingFunction::create(x1, y1, x2, y2).PassAs<cc::CCTim ingFunction>()));
49 } 49 }
50 50
51 WebTransformationMatrix WebTransformAnimationCurveImpl::getValue(double time) co nst 51 WebTransformationMatrix WebTransformAnimationCurveImpl::getValue(double time) co nst
52 { 52 {
53 return m_curve->getValue(time); 53 return m_curve->getValue(time);
54 } 54 }
55 55
56 PassOwnPtr<cc::CCAnimationCurve> WebTransformAnimationCurveImpl::cloneToCCAnimat ionCurve() const 56 scoped_ptr<cc::CCAnimationCurve> WebTransformAnimationCurveImpl::cloneToCCAnimat ionCurve() const
57 { 57 {
58 return m_curve->clone(); 58 return m_curve->clone();
59 } 59 }
60 60
61 } // namespace WebKit 61 } // namespace WebKit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698