OLD | NEW |
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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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().get()); | 87 ASSERT_FALSE(base::MessageLoopProxy::current().get()); |
88 RunTestWithoutMessageLoop(); | 88 RunTestWithoutMessageLoop(); |
89 EXPECT_FALSE(base::MessageLoopProxy::current().get()); | 89 EXPECT_FALSE(base::MessageLoopProxy::current().get()); |
90 } | 90 } |
91 | 91 |
| 92 virtual void DidLoseOutputSurface() OVERRIDE {} |
| 93 |
92 protected: | 94 protected: |
93 virtual void RunTestWithoutMessageLoop() = 0; | 95 virtual void RunTestWithoutMessageLoop() = 0; |
94 | 96 |
95 void SetupLayerTreeHost() { | 97 void SetupLayerTreeHost() { |
96 LayerTreeSettings settings; | 98 LayerTreeSettings settings; |
97 settings.single_thread_proxy_scheduler = false; | 99 settings.single_thread_proxy_scheduler = false; |
98 layer_tree_host_ = | 100 layer_tree_host_ = |
99 LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings, NULL); | 101 LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings, NULL); |
100 layer_tree_host_->SetViewportSize(size_); | 102 layer_tree_host_->SetViewportSize(size_); |
101 layer_tree_host_->SetRootLayer(root_layer_); | 103 layer_tree_host_->SetRootLayer(root_layer_); |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 scoped_refptr<DelegatedFrameProvider> frame_provider_; | 228 scoped_refptr<DelegatedFrameProvider> frame_provider_; |
227 scoped_refptr<DelegatedRendererLayer> delegated_layer_; | 229 scoped_refptr<DelegatedRendererLayer> delegated_layer_; |
228 }; | 230 }; |
229 | 231 |
230 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { | 232 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { |
231 RunTest(); | 233 RunTest(); |
232 } | 234 } |
233 | 235 |
234 } // namespace | 236 } // namespace |
235 } // namespace cc | 237 } // namespace cc |
OLD | NEW |