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

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

Issue 11293120: cc: Remove WebThread includes. (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/resource_update_controller_unittest.cc ('k') | no next file » | 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 "config.h" 5 #include "config.h"
6 6
7 #include "cc/test/layer_tree_test_common.h" 7 #include "cc/test/layer_tree_test_common.h"
8 8
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 #include "cc/active_animation.h" 10 #include "cc/active_animation.h"
(...skipping 10 matching lines...) Expand all
21 #include "cc/test/animation_test_common.h" 21 #include "cc/test/animation_test_common.h"
22 #include "cc/test/fake_web_compositor_output_surface.h" 22 #include "cc/test/fake_web_compositor_output_surface.h"
23 #include "cc/test/fake_web_graphics_context_3d.h" 23 #include "cc/test/fake_web_graphics_context_3d.h"
24 #include "cc/test/occlusion_tracker_test_common.h" 24 #include "cc/test/occlusion_tracker_test_common.h"
25 #include "cc/test/test_common.h" 25 #include "cc/test/test_common.h"
26 #include "cc/test/tiled_layer_test_common.h" 26 #include "cc/test/tiled_layer_test_common.h"
27 #include "cc/timing_function.h" 27 #include "cc/timing_function.h"
28 #include "testing/gmock/include/gmock/gmock.h" 28 #include "testing/gmock/include/gmock/gmock.h"
29 #include <public/WebFilterOperation.h> 29 #include <public/WebFilterOperation.h>
30 #include <public/WebFilterOperations.h> 30 #include <public/WebFilterOperations.h>
31 #include <public/WebThread.h>
32 31
33 using namespace cc; 32 using namespace cc;
34 using namespace WebKit; 33 using namespace WebKit;
35 34
36 namespace WebKitTests { 35 namespace WebKitTests {
37 36
38 scoped_ptr<CompositorFakeWebGraphicsContext3DWithTextureTracking> CompositorFake WebGraphicsContext3DWithTextureTracking::create(Attributes attrs) 37 scoped_ptr<CompositorFakeWebGraphicsContext3DWithTextureTracking> CompositorFake WebGraphicsContext3DWithTextureTracking::create(Attributes attrs)
39 { 38 {
40 return make_scoped_ptr(new CompositorFakeWebGraphicsContext3DWithTextureTrac king(attrs)); 39 return make_scoped_ptr(new CompositorFakeWebGraphicsContext3DWithTextureTrac king(attrs));
41 } 40 }
(...skipping 487 matching lines...) Expand 10 before | Expand all | Expand 10 after
529 ASSERT_FALSE(m_layerTreeHost.get()); 528 ASSERT_FALSE(m_layerTreeHost.get());
530 m_client.reset(); 529 m_client.reset();
531 if (m_timedOut) { 530 if (m_timedOut) {
532 FAIL() << "Test timed out"; 531 FAIL() << "Test timed out";
533 return; 532 return;
534 } 533 }
535 afterTest(); 534 afterTest();
536 } 535 }
537 536
538 } // namespace WebKitTests 537 } // namespace WebKitTests
OLDNEW
« no previous file with comments | « cc/resource_update_controller_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698