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

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

Issue 1001833005: Update from https://crrev.com/320343 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Supress Created 5 years, 9 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_animation.cc ('k') | cc/trees/layer_tree_impl.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/message_loop/message_loop_proxy.h" 5 #include "base/message_loop/message_loop_proxy.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 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 EXPECT_FALSE(base::MessageLoopProxy::current().get()); 97 EXPECT_FALSE(base::MessageLoopProxy::current().get());
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 layer_tree_host_ = LayerTreeHost::CreateSingleThreaded( 108 layer_tree_host_ = LayerTreeHost::CreateSingleThreaded(
108 this, this, nullptr, nullptr, settings, nullptr, nullptr); 109 this, this, nullptr, nullptr, settings, nullptr, nullptr);
109 layer_tree_host_->SetViewportSize(size_); 110 layer_tree_host_->SetViewportSize(size_);
110 layer_tree_host_->SetRootLayer(root_layer_); 111 layer_tree_host_->SetRootLayer(root_layer_);
111 } 112 }
112 113
113 void Composite() { 114 void Composite() {
114 did_commit_ = false; 115 did_commit_ = false;
115 did_commit_and_draw_frame_ = false; 116 did_commit_and_draw_frame_ = false;
116 layer_tree_host_->Composite(gfx::FrameTime::Now()); 117 layer_tree_host_->Composite(gfx::FrameTime::Now());
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 scoped_refptr<DelegatedFrameProvider> frame_provider_; 236 scoped_refptr<DelegatedFrameProvider> frame_provider_;
236 scoped_refptr<DelegatedRendererLayer> delegated_layer_; 237 scoped_refptr<DelegatedRendererLayer> delegated_layer_;
237 }; 238 };
238 239
239 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { 240 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) {
240 RunTest(); 241 RunTest();
241 } 242 }
242 243
243 } // namespace 244 } // namespace
244 } // namespace cc 245 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_unittest_animation.cc ('k') | cc/trees/layer_tree_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698