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

Side by Side Diff: cc/layer_tree_host_unittest.cc

Issue 11361223: cc: Remove cc::settings, move them to LayerTreeSettings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix-unittests 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/layer_tree_host_impl_unittest.cc ('k') | cc/layer_unittest.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/layer_tree_host.h" 5 #include "cc/layer_tree_host.h"
6 6
7 #include "base/synchronization/lock.h" 7 #include "base/synchronization/lock.h"
8 #include "cc/content_layer.h" 8 #include "cc/content_layer.h"
9 #include "cc/content_layer_client.h" 9 #include "cc/content_layer_client.h"
10 #include "cc/graphics_context.h" 10 #include "cc/graphics_context.h"
11 #include "cc/layer_tree_host_impl.h" 11 #include "cc/layer_tree_host_impl.h"
12 #include "cc/settings.h"
13 #include "cc/single_thread_proxy.h" 12 #include "cc/single_thread_proxy.h"
14 #include "cc/test/fake_content_layer_client.h" 13 #include "cc/test/fake_content_layer_client.h"
15 #include "cc/test/fake_web_compositor_output_surface.h" 14 #include "cc/test/fake_web_compositor_output_surface.h"
16 #include "cc/test/geometry_test_utils.h" 15 #include "cc/test/geometry_test_utils.h"
17 #include "cc/test/layer_tree_test_common.h" 16 #include "cc/test/layer_tree_test_common.h"
18 #include "cc/test/occlusion_tracker_test_common.h" 17 #include "cc/test/occlusion_tracker_test_common.h"
19 #include "cc/resource_update_queue.h" 18 #include "cc/resource_update_queue.h"
20 #include "cc/timing_function.h" 19 #include "cc/timing_function.h"
21 #include "testing/gmock/include/gmock/gmock.h" 20 #include "testing/gmock/include/gmock/gmock.h"
22 #include "third_party/khronos/GLES2/gl2.h" 21 #include "third_party/khronos/GLES2/gl2.h"
(...skipping 3235 matching lines...) Expand 10 before | Expand all | Expand 10 after
3258 int m_numCompleteCommits; 3257 int m_numCompleteCommits;
3259 }; 3258 };
3260 3259
3261 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread) 3260 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread)
3262 { 3261 {
3263 runTest(true); 3262 runTest(true);
3264 } 3263 }
3265 3264
3266 } // namespace 3265 } // namespace
3267 } // namespace cc 3266 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layer_tree_host_impl_unittest.cc ('k') | cc/layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698