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

Unified Diff: cc/layers/scrollbar_layer_unittest.cc

Issue 1126253005: cc: Add LayerTreeHost::InitParams for LayerTreeHost creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: all Created 5 years, 7 months 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
Index: cc/layers/scrollbar_layer_unittest.cc
diff --git a/cc/layers/scrollbar_layer_unittest.cc b/cc/layers/scrollbar_layer_unittest.cc
index cee0c9be8567e767593fe06d93804b4c20f21b8a..97d1c80a992781e8a85c305abb486bb0aadc2698 100644
--- a/cc/layers/scrollbar_layer_unittest.cc
+++ b/cc/layers/scrollbar_layer_unittest.cc
@@ -64,8 +64,8 @@ LayerImpl* LayerImplForScrollAreaAndScrollbar(FakeLayerTreeHost* host,
class FakeResourceTrackingLayerTreeHost : public FakeLayerTreeHost {
public:
FakeResourceTrackingLayerTreeHost(FakeLayerTreeHostClient* client,
- const LayerTreeSettings& settings)
- : FakeLayerTreeHost(client, settings),
+ LayerTreeHost::InitParams* params)
+ : FakeLayerTreeHost(client, params),
next_id_(1),
total_ui_resource_created_(0),
total_ui_resource_deleted_(0) {
@@ -121,8 +121,13 @@ class ScrollbarLayerTest : public testing::Test {
public:
ScrollbarLayerTest() : fake_client_(FakeLayerTreeHostClient::DIRECT_3D) {
layer_tree_settings_.single_thread_proxy_scheduler = false;
- layer_tree_host_.reset(new FakeResourceTrackingLayerTreeHost(
- &fake_client_, layer_tree_settings_));
+
+ LayerTreeHost::InitParams params;
+ params.client = &fake_client_;
+ params.settings = &layer_tree_settings_;
+
+ layer_tree_host_.reset(
+ new FakeResourceTrackingLayerTreeHost(&fake_client_, &params));
fake_client_.SetLayerTreeHost(layer_tree_host_.get());
// Force output surface creation for renderer capabilities.
layer_tree_host_->Composite(base::TimeTicks());

Powered by Google App Engine
This is Rietveld 408576698