| 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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 52 no_loop_thread_(this, "LayerTreeHostNoMessageLoopTest") {} | 52 no_loop_thread_(this, "LayerTreeHostNoMessageLoopTest") {} |
| 53 virtual ~LayerTreeHostNoMessageLoopTest() {} | 53 virtual ~LayerTreeHostNoMessageLoopTest() {} |
| 54 | 54 |
| 55 // LayerTreeHostClient overrides. | 55 // LayerTreeHostClient overrides. |
| 56 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} | 56 virtual void WillBeginMainFrame(int frame_id) OVERRIDE {} |
| 57 virtual void DidBeginMainFrame() OVERRIDE {} | 57 virtual void DidBeginMainFrame() OVERRIDE {} |
| 58 virtual void Animate(base::TimeTicks frame_begin_time) OVERRIDE {} | 58 virtual void Animate(base::TimeTicks frame_begin_time) OVERRIDE {} |
| 59 virtual void Layout() OVERRIDE {} | 59 virtual void Layout() OVERRIDE {} |
| 60 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta, | 60 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta, |
| 61 float page_scale) OVERRIDE {} | 61 float page_scale) OVERRIDE {} |
| 62 virtual scoped_ptr<OutputSurface> CreateOutputSurface( | 62 virtual void RequestNewOutputSurface(bool fallback) OVERRIDE { |
| 63 bool fallback) OVERRIDE { | 63 layer_tree_host_->SetOutputSurface( |
| 64 return make_scoped_ptr<OutputSurface>(new NoMessageLoopOutputSurface); | 64 make_scoped_ptr<OutputSurface>(new NoMessageLoopOutputSurface)); |
| 65 } | 65 } |
| 66 virtual void DidInitializeOutputSurface() OVERRIDE { | 66 virtual void DidInitializeOutputSurface() OVERRIDE { |
| 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 {} |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 224 scoped_refptr<DelegatedFrameProvider> frame_provider_; | 224 scoped_refptr<DelegatedFrameProvider> frame_provider_; |
| 225 scoped_refptr<DelegatedRendererLayer> delegated_layer_; | 225 scoped_refptr<DelegatedRendererLayer> delegated_layer_; |
| 226 }; | 226 }; |
| 227 | 227 |
| 228 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { | 228 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { |
| 229 RunTest(); | 229 RunTest(); |
| 230 } | 230 } |
| 231 | 231 |
| 232 } // namespace | 232 } // namespace |
| 233 } // namespace cc | 233 } // namespace cc |
| OLD | NEW |