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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 did_initialize_output_surface_ = true; | 67 did_initialize_output_surface_ = true; |
68 } | 68 } |
69 virtual void WillCommit() OVERRIDE {} | 69 virtual void WillCommit() OVERRIDE {} |
70 virtual void DidCommit() OVERRIDE { did_commit_ = true; } | 70 virtual void DidCommit() OVERRIDE { did_commit_ = true; } |
71 virtual void DidCommitAndDrawFrame() OVERRIDE { | 71 virtual void DidCommitAndDrawFrame() OVERRIDE { |
72 did_commit_and_draw_frame_ = true; | 72 did_commit_and_draw_frame_ = true; |
73 } | 73 } |
74 virtual void DidCompleteSwapBuffers() OVERRIDE {} | 74 virtual void DidCompleteSwapBuffers() OVERRIDE {} |
75 | 75 |
76 // LayerTreeHostSingleThreadClient overrides. | 76 // LayerTreeHostSingleThreadClient overrides. |
77 virtual void ScheduleComposite() OVERRIDE {} | |
78 virtual void ScheduleAnimation() OVERRIDE {} | |
79 virtual void DidPostSwapBuffers() OVERRIDE {} | 77 virtual void DidPostSwapBuffers() OVERRIDE {} |
80 virtual void DidAbortSwapBuffers() OVERRIDE {} | 78 virtual void DidAbortSwapBuffers() OVERRIDE {} |
81 | 79 |
82 void RunTest() { | 80 void RunTest() { |
83 no_loop_thread_.Start(); | 81 no_loop_thread_.Start(); |
84 no_loop_thread_.Join(); | 82 no_loop_thread_.Join(); |
85 } | 83 } |
86 | 84 |
87 // base::DelegateSimpleThread::Delegate override. | 85 // base::DelegateSimpleThread::Delegate override. |
88 virtual void Run() OVERRIDE { | 86 virtual void Run() OVERRIDE { |
89 ASSERT_FALSE(base::MessageLoopProxy::current()); | 87 ASSERT_FALSE(base::MessageLoopProxy::current()); |
90 RunTestWithoutMessageLoop(); | 88 RunTestWithoutMessageLoop(); |
91 EXPECT_FALSE(base::MessageLoopProxy::current()); | 89 EXPECT_FALSE(base::MessageLoopProxy::current()); |
92 } | 90 } |
93 | 91 |
94 protected: | 92 protected: |
95 virtual void RunTestWithoutMessageLoop() = 0; | 93 virtual void RunTestWithoutMessageLoop() = 0; |
96 | 94 |
97 void SetupLayerTreeHost() { | 95 void SetupLayerTreeHost() { |
98 LayerTreeSettings settings; | 96 LayerTreeSettings settings; |
| 97 settings.single_thread_proxy_scheduler = false; |
99 layer_tree_host_ = | 98 layer_tree_host_ = |
100 LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings, NULL); | 99 LayerTreeHost::CreateSingleThreaded(this, this, NULL, settings, NULL); |
101 layer_tree_host_->SetViewportSize(size_); | 100 layer_tree_host_->SetViewportSize(size_); |
102 layer_tree_host_->SetRootLayer(root_layer_); | 101 layer_tree_host_->SetRootLayer(root_layer_); |
103 } | 102 } |
104 | 103 |
105 void Composite() { | 104 void Composite() { |
106 did_commit_ = false; | 105 did_commit_ = false; |
107 did_commit_and_draw_frame_ = false; | 106 did_commit_and_draw_frame_ = false; |
108 layer_tree_host_->Composite(gfx::FrameTime::Now()); | 107 layer_tree_host_->Composite(gfx::FrameTime::Now()); |
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 scoped_refptr<DelegatedFrameProvider> frame_provider_; | 225 scoped_refptr<DelegatedFrameProvider> frame_provider_; |
227 scoped_refptr<DelegatedRendererLayer> delegated_layer_; | 226 scoped_refptr<DelegatedRendererLayer> delegated_layer_; |
228 }; | 227 }; |
229 | 228 |
230 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { | 229 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { |
231 RunTest(); | 230 RunTest(); |
232 } | 231 } |
233 | 232 |
234 } // namespace | 233 } // namespace |
235 } // namespace cc | 234 } // namespace cc |
OLD | NEW |