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

Unified Diff: webkit/compositor_bindings/web_float_animation_curve_impl.h

Issue 12496013: Move compositor bindings implementations out of WebKit::, fix style (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 7 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: webkit/compositor_bindings/web_float_animation_curve_impl.h
diff --git a/webkit/compositor_bindings/web_float_animation_curve_impl.h b/webkit/compositor_bindings/web_float_animation_curve_impl.h
index d20f24325c3b606e099134e36bc0a079b1c9f631..dd9101fbfc30ef4f90c8ece5d7f7c3148fc853e9 100644
--- a/webkit/compositor_bindings/web_float_animation_curve_impl.h
+++ b/webkit/compositor_bindings/web_float_animation_curve_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 WebFloatAnimationCurveImpl_h
-#define WebFloatAnimationCurveImpl_h
+#ifndef WEBKIT_COMPOSITOR_BINDINGS_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_
+#define WEBKIT_COMPOSITOR_BINDINGS_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_
#include "base/memory/scoped_ptr.h"
#include "third_party/WebKit/Source/Platform/chromium/public/WebFloatAnimationCurve.h"
@@ -14,10 +14,11 @@ class AnimationCurve;
class KeyframedFloatAnimationCurve;
}
-namespace WebKit {
-struct WebFloatKeyframe;
+namespace WebKit { struct WebFloatKeyframe; }
-class WebFloatAnimationCurveImpl : public WebFloatAnimationCurve {
+namespace webkit {
+
+class WebFloatAnimationCurveImpl : public WebKit::WebFloatAnimationCurve {
public:
WEBKIT_COMPOSITOR_BINDINGS_EXPORT WebFloatAnimationCurveImpl();
virtual ~WebFloatAnimationCurveImpl();
@@ -26,9 +27,10 @@ class WebFloatAnimationCurveImpl : public WebFloatAnimationCurve {
virtual AnimationCurveType type() const;
// WebFloatAnimationCurve implementation.
- virtual void add(const WebFloatKeyframe&);
- virtual void add(const WebFloatKeyframe&, TimingFunctionType);
- virtual void add(const WebFloatKeyframe&,
+ virtual void add(const WebKit::WebFloatKeyframe& keyframe);
+ virtual void add(const WebKit::WebFloatKeyframe& keyframe,
+ TimingFunctionType type);
+ virtual void add(const WebKit::WebFloatKeyframe& keyframe,
double x1,
double y1,
double x2,
@@ -36,12 +38,14 @@ class WebFloatAnimationCurveImpl : public WebFloatAnimationCurve {
virtual float getValue(double time) const;
- scoped_ptr<cc::AnimationCurve> cloneToAnimationCurve() const;
+ scoped_ptr<cc::AnimationCurve> CloneToAnimationCurve() const;
private:
scoped_ptr<cc::KeyframedFloatAnimationCurve> curve_;
+
+ DISALLOW_COPY_AND_ASSIGN(WebFloatAnimationCurveImpl);
};
-}
+} // namespace webkit
-#endif // WebFloatAnimationCurveImpl_h
+#endif // WEBKIT_COMPOSITOR_BINDINGS_WEB_FLOAT_ANIMATION_CURVE_IMPL_H_

Powered by Google App Engine
This is Rietveld 408576698