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

Side by Side Diff: webkit/compositor_bindings/WebFloatAnimationCurveImpl.h

Issue 11086053: Revert 161133 - [cc] Use base ptr types for cc's CSS animation classes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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 #ifndef WebFloatAnimationCurveImpl_h 5 #ifndef WebFloatAnimationCurveImpl_h
6 #define WebFloatAnimationCurveImpl_h 6 #define WebFloatAnimationCurveImpl_h
7 7
8 #include "base/memory/scoped_ptr.h"
9 #include <public/WebFloatAnimationCurve.h> 8 #include <public/WebFloatAnimationCurve.h>
9 #include <wtf/OwnPtr.h>
10 #include <wtf/PassOwnPtr.h>
10 11
11 namespace cc { 12 namespace cc {
12 class CCAnimationCurve; 13 class CCAnimationCurve;
13 class CCKeyframedFloatAnimationCurve; 14 class CCKeyframedFloatAnimationCurve;
14 } 15 }
15 16
16 namespace WebKit { 17 namespace WebKit {
17 18
18 class WebFloatAnimationCurveImpl : public WebFloatAnimationCurve { 19 class WebFloatAnimationCurveImpl : public WebFloatAnimationCurve {
19 public: 20 public:
20 WebFloatAnimationCurveImpl(); 21 WebFloatAnimationCurveImpl();
21 virtual ~WebFloatAnimationCurveImpl(); 22 virtual ~WebFloatAnimationCurveImpl();
22 23
23 // WebAnimationCurve implementation. 24 // WebAnimationCurve implementation.
24 virtual AnimationCurveType type() const OVERRIDE; 25 virtual AnimationCurveType type() const OVERRIDE;
25 26
26 // WebFloatAnimationCurve implementation. 27 // WebFloatAnimationCurve implementation.
27 virtual void add(const WebFloatKeyframe&) OVERRIDE; 28 virtual void add(const WebFloatKeyframe&) OVERRIDE;
28 virtual void add(const WebFloatKeyframe&, TimingFunctionType) OVERRIDE; 29 virtual void add(const WebFloatKeyframe&, TimingFunctionType) OVERRIDE;
29 virtual void add(const WebFloatKeyframe&, double x1, double y1, double x2, d ouble y2) OVERRIDE; 30 virtual void add(const WebFloatKeyframe&, double x1, double y1, double x2, d ouble y2) OVERRIDE;
30 31
31 virtual float getValue(double time) const OVERRIDE; 32 virtual float getValue(double time) const OVERRIDE;
32 33
33 scoped_ptr<cc::CCAnimationCurve> cloneToCCAnimationCurve() const; 34 PassOwnPtr<cc::CCAnimationCurve> cloneToCCAnimationCurve() const;
34 35
35 private: 36 private:
36 scoped_ptr<cc::CCKeyframedFloatAnimationCurve> m_curve; 37 OwnPtr<cc::CCKeyframedFloatAnimationCurve> m_curve;
37 }; 38 };
38 39
39 } 40 }
40 41
41 #endif // WebFloatAnimationCurveImpl_h 42 #endif // WebFloatAnimationCurveImpl_h
OLDNEW
« no previous file with comments | « webkit/compositor_bindings/WebAnimationImpl.cpp ('k') | webkit/compositor_bindings/WebFloatAnimationCurveImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698