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

Unified Diff: webkit/compositor_bindings/web_animation_unittest.cc

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_animation_unittest.cc
diff --git a/webkit/compositor_bindings/web_animation_unittest.cc b/webkit/compositor_bindings/web_animation_unittest.cc
index 4fc1ba058d897f8295627216e6fcce0ec4340713..925a78b1107feaad324317ef3456b7e7acfe482b 100644
--- a/webkit/compositor_bindings/web_animation_unittest.cc
+++ b/webkit/compositor_bindings/web_animation_unittest.cc
@@ -7,14 +7,17 @@
#include "webkit/compositor_bindings/web_animation_impl.h"
#include "webkit/compositor_bindings/web_float_animation_curve_impl.h"
-using namespace WebKit;
+using WebKit::WebAnimation;
+using WebKit::WebAnimationCurve;
+using WebKit::WebFloatAnimationCurve;
+namespace webkit {
namespace {
TEST(WebAnimationTest, DefaultSettings) {
scoped_ptr<WebAnimationCurve> curve(new WebFloatAnimationCurveImpl());
scoped_ptr<WebAnimation> animation(
- new WebAnimationImpl(*curve, WebAnimation::TargetPropertyOpacity, 1));
+ new WebAnimationImpl(*curve, WebAnimation::TargetPropertyOpacity, 1, 0));
// Ensure that the defaults are correct.
EXPECT_EQ(1, animation->iterations());
@@ -26,7 +29,7 @@ TEST(WebAnimationTest, DefaultSettings) {
TEST(WebAnimationTest, ModifiedSettings) {
scoped_ptr<WebFloatAnimationCurve> curve(new WebFloatAnimationCurveImpl());
scoped_ptr<WebAnimation> animation(
- new WebAnimationImpl(*curve, WebAnimation::TargetPropertyOpacity, 1));
+ new WebAnimationImpl(*curve, WebAnimation::TargetPropertyOpacity, 1, 0));
animation->setIterations(2);
animation->setStartTime(2);
animation->setTimeOffset(2);
@@ -39,3 +42,4 @@ TEST(WebAnimationTest, ModifiedSettings) {
}
} // namespace
+} // namespace webkit
« no previous file with comments | « webkit/compositor_bindings/web_animation_impl.cc ('k') | webkit/compositor_bindings/web_compositor_support_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698