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

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

Issue 514123002: Manual fixups in compositor code scoped_refptr operator T* removal. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build Created 6 years, 3 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_impl_unittest.cc ('k') | ui/compositor/layer.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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 virtual void DidPostSwapBuffers() OVERRIDE {} 77 virtual void DidPostSwapBuffers() OVERRIDE {}
78 virtual void DidAbortSwapBuffers() OVERRIDE {} 78 virtual void DidAbortSwapBuffers() OVERRIDE {}
79 79
80 void RunTest() { 80 void RunTest() {
81 no_loop_thread_.Start(); 81 no_loop_thread_.Start();
82 no_loop_thread_.Join(); 82 no_loop_thread_.Join();
83 } 83 }
84 84
85 // base::DelegateSimpleThread::Delegate override. 85 // base::DelegateSimpleThread::Delegate override.
86 virtual void Run() OVERRIDE { 86 virtual void Run() OVERRIDE {
87 ASSERT_FALSE(base::MessageLoopProxy::current()); 87 ASSERT_FALSE(base::MessageLoopProxy::current().get());
88 RunTestWithoutMessageLoop(); 88 RunTestWithoutMessageLoop();
89 EXPECT_FALSE(base::MessageLoopProxy::current()); 89 EXPECT_FALSE(base::MessageLoopProxy::current().get());
90 } 90 }
91 91
92 protected: 92 protected:
93 virtual void RunTestWithoutMessageLoop() = 0; 93 virtual void RunTestWithoutMessageLoop() = 0;
94 94
95 void SetupLayerTreeHost() { 95 void SetupLayerTreeHost() {
96 LayerTreeSettings settings; 96 LayerTreeSettings settings;
97 settings.single_thread_proxy_scheduler = false; 97 settings.single_thread_proxy_scheduler = false;
98 layer_tree_host_ = 98 layer_tree_host_ =
99 LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings, NULL); 99 LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings, NULL);
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 scoped_refptr<DelegatedFrameProvider> frame_provider_; 226 scoped_refptr<DelegatedFrameProvider> frame_provider_;
227 scoped_refptr<DelegatedRendererLayer> delegated_layer_; 227 scoped_refptr<DelegatedRendererLayer> delegated_layer_;
228 }; 228 };
229 229
230 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { 230 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) {
231 RunTest(); 231 RunTest();
232 } 232 }
233 233
234 } // namespace 234 } // namespace
235 } // namespace cc 235 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_impl_unittest.cc ('k') | ui/compositor/layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698