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

Side by Side Diff: content/renderer/compositor_bindings/web_animation_impl.h

Issue 423373003: CC: Support fractional iteration count on compositor animations (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Minor fixes Created 6 years, 4 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ 5 #ifndef CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_
6 #define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ 6 #define CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "content/common/content_export.h" 9 #include "content/common/content_export.h"
10 #include "third_party/WebKit/public/platform/WebAnimation.h" 10 #include "third_party/WebKit/public/platform/WebAnimation.h"
(...skipping 13 matching lines...) Expand all
24 CONTENT_EXPORT WebAnimationImpl( 24 CONTENT_EXPORT WebAnimationImpl(
25 const blink::WebAnimationCurve& curve, 25 const blink::WebAnimationCurve& curve,
26 TargetProperty target, 26 TargetProperty target,
27 int animation_id, 27 int animation_id,
28 int group_id); 28 int group_id);
29 virtual ~WebAnimationImpl(); 29 virtual ~WebAnimationImpl();
30 30
31 // blink::WebAnimation implementation 31 // blink::WebAnimation implementation
32 virtual int id(); 32 virtual int id();
33 virtual TargetProperty targetProperty() const; 33 virtual TargetProperty targetProperty() const;
34 #if WEB_ANIMATION_SUPPORTS_FRACTIONAL_ITERATIONS
35 virtual double iterations() const;
36 virtual void setIterations(double iterations);
37 #else
34 virtual int iterations() const; 38 virtual int iterations() const;
35 virtual void setIterations(int iterations); 39 virtual void setIterations(int iterations);
40 #endif
36 virtual double startTime() const; 41 virtual double startTime() const;
37 virtual void setStartTime(double monotonic_time); 42 virtual void setStartTime(double monotonic_time);
38 virtual double timeOffset() const; 43 virtual double timeOffset() const;
39 virtual void setTimeOffset(double monotonic_time); 44 virtual void setTimeOffset(double monotonic_time);
40 #if WEB_ANIMATION_SUPPORTS_FULL_DIRECTION 45 #if WEB_ANIMATION_SUPPORTS_FULL_DIRECTION
41 virtual Direction direction() const; 46 virtual Direction direction() const;
42 virtual void setDirection(Direction); 47 virtual void setDirection(Direction);
43 #else 48 #else
44 virtual bool alternatesDirection() const; 49 virtual bool alternatesDirection() const;
45 virtual void setAlternatesDirection(bool alternates); 50 virtual void setAlternatesDirection(bool alternates);
46 #endif 51 #endif
47 52
48 scoped_ptr<cc::Animation> PassAnimation(); 53 scoped_ptr<cc::Animation> PassAnimation();
49 54
50 private: 55 private:
51 scoped_ptr<cc::Animation> animation_; 56 scoped_ptr<cc::Animation> animation_;
52 57
53 DISALLOW_COPY_AND_ASSIGN(WebAnimationImpl); 58 DISALLOW_COPY_AND_ASSIGN(WebAnimationImpl);
54 }; 59 };
55 60
56 } // namespace content 61 } // namespace content
57 62
58 #endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ 63 #endif // CONTENT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_
59 64
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698