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

Unified Diff: ui/android/resources/resource_manager_impl_unittest.cc

Issue 1464313007: cc: Introduce CompositorMode enum. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change ui::MockLayerTreeHost Created 5 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/android/resources/resource_manager_impl_unittest.cc
diff --git a/ui/android/resources/resource_manager_impl_unittest.cc b/ui/android/resources/resource_manager_impl_unittest.cc
index fd57f7057bd187a97b183d3df22a308e830436d9..de66bf99692839663f3cea51aa3af060dbecb1a7 100644
--- a/ui/android/resources/resource_manager_impl_unittest.cc
+++ b/ui/android/resources/resource_manager_impl_unittest.cc
@@ -69,8 +69,9 @@ const ui::SystemUIResourceType kTestResourceType = ui::OVERSCROLL_GLOW;
class MockLayerTreeHost : public cc::LayerTreeHost {
public:
- MockLayerTreeHost(cc::LayerTreeHost::InitParams* params)
- : cc::LayerTreeHost(params) {}
+ MockLayerTreeHost(cc::LayerTreeHost::InitParams* params,
+ cc::CompositorMode mode)
+ : cc::LayerTreeHost(params, mode) {}
MOCK_METHOD1(CreateUIResource, cc::UIResourceId(cc::UIResourceClient*));
MOCK_METHOD1(DeleteUIResource, void(cc::UIResourceId));
@@ -92,7 +93,8 @@ class ResourceManagerTest : public testing::Test {
params.client = &fake_client_;
params.settings = &settings;
params.task_graph_runner = &task_graph_runner_;
- host_.reset(new MockLayerTreeHost(&params));
+ host_.reset(new MockLayerTreeHost(&params,
+ cc::CompositorMode::SingleThreaded));
resource_manager_.Init(host_.get());
}
« no previous file with comments | « cc/trees/layer_tree_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698