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

Side by Side Diff: cc/test/layer_tree_test_common.cc

Issue 11312181: cc: Remove the remaining using-directives of namespace cc. (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
« no previous file with comments | « cc/test/animation_test_common.cc ('k') | cc/test/tiled_layer_test_common.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 "cc/test/layer_tree_test_common.h" 5 #include "cc/test/layer_tree_test_common.h"
6 6
7 #include "base/stl_util.h" 7 #include "base/stl_util.h"
8 #include "cc/active_animation.h" 8 #include "cc/active_animation.h"
9 #include "cc/content_layer.h" 9 #include "cc/content_layer.h"
10 #include "cc/input_handler.h" 10 #include "cc/input_handler.h"
11 #include "cc/layer.h" 11 #include "cc/layer.h"
12 #include "cc/layer_animation_controller.h" 12 #include "cc/layer_animation_controller.h"
13 #include "cc/layer_impl.h" 13 #include "cc/layer_impl.h"
14 #include "cc/layer_tree_host_impl.h" 14 #include "cc/layer_tree_host_impl.h"
15 #include "cc/scoped_thread_proxy.h" 15 #include "cc/scoped_thread_proxy.h"
16 #include "cc/settings.h" 16 #include "cc/settings.h"
17 #include "cc/single_thread_proxy.h" 17 #include "cc/single_thread_proxy.h"
18 #include "cc/thread_impl.h" 18 #include "cc/thread_impl.h"
19 #include "cc/test/animation_test_common.h" 19 #include "cc/test/animation_test_common.h"
20 #include "cc/test/fake_web_compositor_output_surface.h" 20 #include "cc/test/fake_web_compositor_output_surface.h"
21 #include "cc/test/fake_web_graphics_context_3d.h" 21 #include "cc/test/fake_web_graphics_context_3d.h"
22 #include "cc/test/occlusion_tracker_test_common.h" 22 #include "cc/test/occlusion_tracker_test_common.h"
23 #include "cc/test/test_common.h" 23 #include "cc/test/test_common.h"
24 #include "cc/test/tiled_layer_test_common.h" 24 #include "cc/test/tiled_layer_test_common.h"
25 #include "cc/timing_function.h" 25 #include "cc/timing_function.h"
26 #include "testing/gmock/include/gmock/gmock.h" 26 #include "testing/gmock/include/gmock/gmock.h"
27 #include <public/WebFilterOperation.h> 27 #include <public/WebFilterOperation.h>
28 #include <public/WebFilterOperations.h> 28 #include <public/WebFilterOperations.h>
29 29
30 using namespace cc; 30 using cc::InputHandler;
31 using cc::Layer;
32 using cc::LayerTreeHostImplClient;
33 using cc::LayerTreeSettings;
34 using cc::Proxy;
35 using cc::ScopedThreadProxy;
36 using cc::Settings;
37
31 using namespace WebKit; 38 using namespace WebKit;
32 39
33 namespace WebKitTests { 40 namespace WebKitTests {
34 41
35 scoped_ptr<CompositorFakeWebGraphicsContext3DWithTextureTracking> CompositorFake WebGraphicsContext3DWithTextureTracking::create(Attributes attrs) 42 scoped_ptr<CompositorFakeWebGraphicsContext3DWithTextureTracking> CompositorFake WebGraphicsContext3DWithTextureTracking::create(Attributes attrs)
36 { 43 {
37 return make_scoped_ptr(new CompositorFakeWebGraphicsContext3DWithTextureTrac king(attrs)); 44 return make_scoped_ptr(new CompositorFakeWebGraphicsContext3DWithTextureTrac king(attrs));
38 } 45 }
39 46
40 WebGLId CompositorFakeWebGraphicsContext3DWithTextureTracking::createTexture() 47 WebGLId CompositorFakeWebGraphicsContext3DWithTextureTracking::createTexture()
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 ASSERT_FALSE(m_layerTreeHost.get()); 531 ASSERT_FALSE(m_layerTreeHost.get());
525 m_client.reset(); 532 m_client.reset();
526 if (m_timedOut) { 533 if (m_timedOut) {
527 FAIL() << "Test timed out"; 534 FAIL() << "Test timed out";
528 return; 535 return;
529 } 536 }
530 afterTest(); 537 afterTest();
531 } 538 }
532 539
533 } // namespace WebKitTests 540 } // namespace WebKitTests
OLDNEW
« no previous file with comments | « cc/test/animation_test_common.cc ('k') | cc/test/tiled_layer_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698