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

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

Issue 220403002: Revert "Handle direction control in compositor Animations" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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 WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ 5 #ifndef WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_
6 #define WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ 6 #define WEBKIT_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 "third_party/WebKit/public/platform/WebAnimation.h" 9 #include "third_party/WebKit/public/platform/WebAnimation.h"
10 #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export. h" 10 #include "webkit/renderer/compositor_bindings/webkit_compositor_bindings_export. h"
(...skipping 15 matching lines...) Expand all
26 26
27 // blink::WebAnimation implementation 27 // blink::WebAnimation implementation
28 virtual int id(); 28 virtual int id();
29 virtual TargetProperty targetProperty() const; 29 virtual TargetProperty targetProperty() const;
30 virtual int iterations() const; 30 virtual int iterations() const;
31 virtual void setIterations(int iterations); 31 virtual void setIterations(int iterations);
32 virtual double startTime() const; 32 virtual double startTime() const;
33 virtual void setStartTime(double monotonic_time); 33 virtual void setStartTime(double monotonic_time);
34 virtual double timeOffset() const; 34 virtual double timeOffset() const;
35 virtual void setTimeOffset(double monotonic_time); 35 virtual void setTimeOffset(double monotonic_time);
36 #if WEB_ANIMATION_SUPPORTS_FULL_DIRECTION
37 virtual Direction direction() const;
38 virtual void setDirection(Direction);
39 #else
40 virtual bool alternatesDirection() const; 36 virtual bool alternatesDirection() const;
41 virtual void setAlternatesDirection(bool alternates); 37 virtual void setAlternatesDirection(bool alternates);
42 #endif
43 38
44 scoped_ptr<cc::Animation> PassAnimation(); 39 scoped_ptr<cc::Animation> PassAnimation();
45 40
46 private: 41 private:
47 scoped_ptr<cc::Animation> animation_; 42 scoped_ptr<cc::Animation> animation_;
48 43
49 DISALLOW_COPY_AND_ASSIGN(WebAnimationImpl); 44 DISALLOW_COPY_AND_ASSIGN(WebAnimationImpl);
50 }; 45 };
51 46
52 } // namespace webkit 47 } // namespace webkit
53 48
54 #endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ 49 #endif // WEBKIT_RENDERER_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_
OLDNEW
« no previous file with comments | « cc/animation/animation_unittest.cc ('k') | webkit/renderer/compositor_bindings/web_animation_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698