Index: webkit/compositor_bindings/web_animation_impl.h |
diff --git a/webkit/compositor_bindings/web_animation_impl.h b/webkit/compositor_bindings/web_animation_impl.h |
index b70a3c618ca578469ab8d0b7454624012d059ee5..53071bf2f5b521c7aa5b4bf14d0bab20d94eeaaa 100644 |
--- a/webkit/compositor_bindings/web_animation_impl.h |
+++ b/webkit/compositor_bindings/web_animation_impl.h |
@@ -2,8 +2,8 @@ |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef WebAnimationImpl_h |
-#define WebAnimationImpl_h |
+#ifndef WEBKIT_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ |
+#define WEBKIT_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ |
#include "base/memory/scoped_ptr.h" |
#include "third_party/WebKit/Source/Platform/chromium/public/WebAnimation.h" |
@@ -11,35 +11,39 @@ |
namespace cc { class Animation; } |
-namespace WebKit { |
-class WebAnimationCurve; |
+namespace WebKit { class WebAnimationCurve; } |
-class WebAnimationImpl : public WebAnimation { |
+namespace webkit { |
+ |
+class WebAnimationImpl : public WebKit::WebAnimation { |
public: |
- WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebAnimationImpl(const WebAnimationCurve&, |
- TargetProperty, |
- int animation_id, |
- int group_id = 0); |
+ WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebAnimationImpl( |
+ const WebKit::WebAnimationCurve& curve, |
+ TargetProperty target, |
+ int animation_id, |
+ int group_id); |
virtual ~WebAnimationImpl(); |
- // WebAnimation implementation |
+ // WebKit::WebAnimation implementation |
virtual int id(); |
virtual TargetProperty targetProperty() const; |
virtual int iterations() const; |
- virtual void setIterations(int); |
+ virtual void setIterations(int iterations); |
virtual double startTime() const; |
virtual void setStartTime(double monotonic_time); |
virtual double timeOffset() const; |
virtual void setTimeOffset(double monotonic_time); |
virtual bool alternatesDirection() const; |
- virtual void setAlternatesDirection(bool); |
+ virtual void setAlternatesDirection(bool alternates); |
- scoped_ptr<cc::Animation> cloneToAnimation(); |
+ scoped_ptr<cc::Animation> CloneToAnimation(); |
private: |
scoped_ptr<cc::Animation> animation_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(WebAnimationImpl); |
}; |
-} |
+} // namespace webkit |
-#endif // WebAnimationImpl_h |
+#endif // WEBKIT_COMPOSITOR_BINDINGS_WEB_ANIMATION_IMPL_H_ |