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

Side by Side Diff: cc/layer_animation_controller_unittest.cc

Issue 11410022: cc: Remove forbidden using namespace directives. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 #include "config.h" 5 #include "config.h"
6 6
7 #include "cc/layer_animation_controller.h" 7 #include "cc/layer_animation_controller.h"
8 8
9 #include "cc/active_animation.h" 9 #include "cc/active_animation.h"
10 #include "cc/animation_curve.h" 10 #include "cc/animation_curve.h"
11 #include "cc/test/animation_test_common.h" 11 #include "cc/test/animation_test_common.h"
12 #include "testing/gmock/include/gmock/gmock.h" 12 #include "testing/gmock/include/gmock/gmock.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 #include <public/WebTransformationMatrix.h> 14 #include <public/WebTransformationMatrix.h>
15 15
16 using namespace cc;
17 using namespace WebKitTests; 16 using namespace WebKitTests;
18 using WebKit::WebTransformationMatrix; 17 using WebKit::WebTransformationMatrix;
19 18
19 namespace cc {
20 namespace { 20 namespace {
21 21
22 void expectTranslateX(double translateX, const WebTransformationMatrix& matrix) 22 void expectTranslateX(double translateX, const WebTransformationMatrix& matrix)
23 { 23 {
24 EXPECT_FLOAT_EQ(translateX, matrix.m41()); 24 EXPECT_FLOAT_EQ(translateX, matrix.m41());
25 } 25 }
26 26
27 scoped_ptr<ActiveAnimation> createActiveAnimation(scoped_ptr<AnimationCurve> cur ve, int id, ActiveAnimation::TargetProperty property) 27 scoped_ptr<ActiveAnimation> createActiveAnimation(scoped_ptr<AnimationCurve> cur ve, int id, ActiveAnimation::TargetProperty property)
28 { 28 {
29 return ActiveAnimation::create(curve.Pass(), 0, id, property); 29 return ActiveAnimation::create(curve.Pass(), 0, id, property);
(...skipping 521 matching lines...) Expand 10 before | Expand all | Expand 10 after
551 551
552 controller->setForceSync(); 552 controller->setForceSync();
553 553
554 controller->pushAnimationUpdatesTo(controllerImpl.get()); 554 controller->pushAnimationUpdatesTo(controllerImpl.get());
555 555
556 activeAnimation = controllerImpl->getActiveAnimation(0, ActiveAnimation::Opa city); 556 activeAnimation = controllerImpl->getActiveAnimation(0, ActiveAnimation::Opa city);
557 EXPECT_TRUE(activeAnimation); 557 EXPECT_TRUE(activeAnimation);
558 EXPECT_EQ(ActiveAnimation::WaitingForTargetAvailability, activeAnimation->ru nState()); 558 EXPECT_EQ(ActiveAnimation::WaitingForTargetAvailability, activeAnimation->ru nState());
559 } 559 }
560 560
561 } // anonymous namespace 561 } // namespace
562 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698