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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
71 make_scoped_ptr<OutputSurface>(new NoMessageLoopOutputSurface)); | 71 make_scoped_ptr<OutputSurface>(new NoMessageLoopOutputSurface)); |
72 } | 72 } |
73 void DidInitializeOutputSurface() override { | 73 void DidInitializeOutputSurface() override { |
74 did_initialize_output_surface_ = true; | 74 did_initialize_output_surface_ = true; |
75 } | 75 } |
76 void DidFailToInitializeOutputSurface() override {} | 76 void DidFailToInitializeOutputSurface() override {} |
77 void WillCommit() override {} | 77 void WillCommit() override {} |
78 void DidCommit() override { did_commit_ = true; } | 78 void DidCommit() override { did_commit_ = true; } |
79 void DidCommitAndDrawFrame() override { did_commit_and_draw_frame_ = true; } | 79 void DidCommitAndDrawFrame() override { did_commit_and_draw_frame_ = true; } |
80 void DidCompleteSwapBuffers() override {} | 80 void DidCompleteSwapBuffers() override {} |
| 81 void DidCompletePageScaleAnimation() override {} |
81 | 82 |
82 // LayerTreeHostSingleThreadClient overrides. | 83 // LayerTreeHostSingleThreadClient overrides. |
83 void DidPostSwapBuffers() override {} | 84 void DidPostSwapBuffers() override {} |
84 void DidAbortSwapBuffers() override {} | 85 void DidAbortSwapBuffers() override {} |
85 | 86 |
86 void RunTest() { | 87 void RunTest() { |
87 no_loop_thread_.Start(); | 88 no_loop_thread_.Start(); |
88 no_loop_thread_.Join(); | 89 no_loop_thread_.Join(); |
89 } | 90 } |
90 | 91 |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 scoped_refptr<DelegatedFrameProvider> frame_provider_; | 234 scoped_refptr<DelegatedFrameProvider> frame_provider_; |
234 scoped_refptr<DelegatedRendererLayer> delegated_layer_; | 235 scoped_refptr<DelegatedRendererLayer> delegated_layer_; |
235 }; | 236 }; |
236 | 237 |
237 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { | 238 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { |
238 RunTest(); | 239 RunTest(); |
239 } | 240 } |
240 | 241 |
241 } // namespace | 242 } // namespace |
242 } // namespace cc | 243 } // namespace cc |
OLD | NEW |