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

Side by Side Diff: cc/trees/layer_tree_host_unittest_no_message_loop.cc

Issue 1126253005: cc: Add LayerTreeHost::InitParams for LayerTreeHost creation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . 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 unified diff | Download patch
« no previous file with comments | « cc/trees/layer_tree_host_unittest.cc ('k') | cc/trees/layer_tree_host_unittest_scroll.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "base/thread_task_runner_handle.h" 5 #include "base/thread_task_runner_handle.h"
6 #include "base/threading/simple_thread.h" 6 #include "base/threading/simple_thread.h"
7 #include "cc/layers/delegated_frame_provider.h" 7 #include "cc/layers/delegated_frame_provider.h"
8 #include "cc/layers/delegated_frame_resource_collection.h" 8 #include "cc/layers/delegated_frame_resource_collection.h"
9 #include "cc/layers/delegated_renderer_layer.h" 9 #include "cc/layers/delegated_renderer_layer.h"
10 #include "cc/layers/layer.h" 10 #include "cc/layers/layer.h"
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 } 98 }
99 99
100 protected: 100 protected:
101 virtual void RunTestWithoutMessageLoop() = 0; 101 virtual void RunTestWithoutMessageLoop() = 0;
102 102
103 void SetupLayerTreeHost() { 103 void SetupLayerTreeHost() {
104 LayerTreeSettings settings; 104 LayerTreeSettings settings;
105 settings.single_thread_proxy_scheduler = false; 105 settings.single_thread_proxy_scheduler = false;
106 settings.verify_property_trees = true; 106 settings.verify_property_trees = true;
107 settings.raster_enabled = false; 107 settings.raster_enabled = false;
108 layer_tree_host_ = LayerTreeHost::CreateSingleThreaded( 108
109 this, this, nullptr, nullptr, nullptr, settings, nullptr, nullptr); 109 LayerTreeHost::InitParams params;
110 params.client = this;
111 params.settings = &settings;
112 layer_tree_host_ = LayerTreeHost::CreateSingleThreaded(this, &params);
110 layer_tree_host_->SetViewportSize(size_); 113 layer_tree_host_->SetViewportSize(size_);
111 layer_tree_host_->SetRootLayer(root_layer_); 114 layer_tree_host_->SetRootLayer(root_layer_);
112 } 115 }
113 116
114 void Composite() { 117 void Composite() {
115 did_commit_ = false; 118 did_commit_ = false;
116 did_commit_and_draw_frame_ = false; 119 did_commit_and_draw_frame_ = false;
117 layer_tree_host_->Composite(gfx::FrameTime::Now()); 120 layer_tree_host_->Composite(gfx::FrameTime::Now());
118 EXPECT_TRUE(did_initialize_output_surface_); 121 EXPECT_TRUE(did_initialize_output_surface_);
119 EXPECT_TRUE(did_commit_); 122 EXPECT_TRUE(did_commit_);
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 scoped_refptr<DelegatedFrameProvider> frame_provider_; 239 scoped_refptr<DelegatedFrameProvider> frame_provider_;
237 scoped_refptr<DelegatedRendererLayer> delegated_layer_; 240 scoped_refptr<DelegatedRendererLayer> delegated_layer_;
238 }; 241 };
239 242
240 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { 243 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) {
241 RunTest(); 244 RunTest();
242 } 245 }
243 246
244 } // namespace 247 } // namespace
245 } // namespace cc 248 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest.cc ('k') | cc/trees/layer_tree_host_unittest_scroll.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698