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

Side by Side Diff: webkit/compositor_bindings/WebAnimationImpl.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 WebAnimationImpl_h 5 #ifndef WebAnimationImpl_h
6 #define WebAnimationImpl_h 6 #define WebAnimationImpl_h
7 7
8 #include "base/memory/scoped_ptr.h"
9 #include <public/WebAnimation.h> 8 #include <public/WebAnimation.h>
10 #include <wtf/OwnPtr.h> 9 #include <wtf/OwnPtr.h>
11 #include <wtf/PassOwnPtr.h> 10 #include <wtf/PassOwnPtr.h>
12 11
13 namespace cc { 12 namespace cc {
14 class CCActiveAnimation; 13 class CCActiveAnimation;
15 } 14 }
16 15
17 namespace WebKit { 16 namespace WebKit {
18 17
19 class WebAnimationImpl : public WebAnimation { 18 class WebAnimationImpl : public WebAnimation {
20 public: 19 public:
21 WebAnimationImpl(const WebAnimationCurve&, TargetProperty, int animationId, int groupId = 0); 20 WebAnimationImpl(const WebAnimationCurve&, TargetProperty, int animationId, int groupId = 0);
22 virtual ~WebAnimationImpl(); 21 virtual ~WebAnimationImpl();
23 22
24 // WebAnimation implementation 23 // WebAnimation implementation
25 virtual int id() OVERRIDE; 24 virtual int id() OVERRIDE;
26 virtual TargetProperty targetProperty() const OVERRIDE; 25 virtual TargetProperty targetProperty() const OVERRIDE;
27 virtual int iterations() const OVERRIDE; 26 virtual int iterations() const OVERRIDE;
28 virtual void setIterations(int) OVERRIDE; 27 virtual void setIterations(int) OVERRIDE;
29 virtual double startTime() const OVERRIDE; 28 virtual double startTime() const OVERRIDE;
30 virtual void setStartTime(double monotonicTime) OVERRIDE; 29 virtual void setStartTime(double monotonicTime) OVERRIDE;
31 virtual double timeOffset() const OVERRIDE; 30 virtual double timeOffset() const OVERRIDE;
32 virtual void setTimeOffset(double monotonicTime) OVERRIDE; 31 virtual void setTimeOffset(double monotonicTime) OVERRIDE;
33 virtual bool alternatesDirection() const OVERRIDE; 32 virtual bool alternatesDirection() const OVERRIDE;
34 virtual void setAlternatesDirection(bool) OVERRIDE; 33 virtual void setAlternatesDirection(bool) OVERRIDE;
35 34
36 scoped_ptr<cc::CCActiveAnimation> cloneToCCAnimation(); 35 PassOwnPtr<cc::CCActiveAnimation> cloneToCCAnimation();
37
38 private: 36 private:
39 scoped_ptr<cc::CCActiveAnimation> m_animation; 37 OwnPtr<cc::CCActiveAnimation> m_animation;
40 }; 38 };
41 39
42 } 40 }
43 41
44 #endif // WebAnimationImpl_h 42 #endif // WebAnimationImpl_h
OLDNEW
« no previous file with comments | « webkit/compositor_bindings/WebAnimationCurveCommon.cpp ('k') | webkit/compositor_bindings/WebAnimationImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698