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

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: Using WebLayerTreeSettings for things WebKit can 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 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 3193 matching lines...) Expand 10 before | Expand all | Expand 10 after
3216 int m_numCompleteCommits; 3215 int m_numCompleteCommits;
3217 }; 3216 };
3218 3217
3219 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread) 3218 TEST_F(LayerTreeHostTestDeferCommits, runMultiThread)
3220 { 3219 {
3221 runTest(true); 3220 runTest(true);
3222 } 3221 }
3223 3222
3224 } // namespace 3223 } // namespace
3225 } // namespace cc 3224 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698