| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 void DidBeginMainFrame() override {} | 59 void DidBeginMainFrame() override {} |
| 60 void Layout() override {} | 60 void Layout() override {} |
| 61 void ApplyViewportDeltas(const gfx::Vector2d& inner_delta, | 61 void ApplyViewportDeltas(const gfx::Vector2d& inner_delta, |
| 62 const gfx::Vector2d& outer_delta, | 62 const gfx::Vector2d& outer_delta, |
| 63 const gfx::Vector2dF& elastic_overscroll_delta, | 63 const gfx::Vector2dF& elastic_overscroll_delta, |
| 64 float page_scale, | 64 float page_scale, |
| 65 float top_controls_delta) override {} | 65 float top_controls_delta) override {} |
| 66 void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, | 66 void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, |
| 67 float page_scale, | 67 float page_scale, |
| 68 float top_controls_delta) override {} | 68 float top_controls_delta) override {} |
| 69 void RequestNewOutputSurface(bool fallback) override { | 69 void RequestNewOutputSurface() override { |
| 70 layer_tree_host_->SetOutputSurface( | 70 layer_tree_host_->SetOutputSurface( |
| 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 WillCommit() override {} | 77 void WillCommit() override {} |
| 77 void DidCommit() override { did_commit_ = true; } | 78 void DidCommit() override { did_commit_ = true; } |
| 78 void DidCommitAndDrawFrame() override { did_commit_and_draw_frame_ = true; } | 79 void DidCommitAndDrawFrame() override { did_commit_and_draw_frame_ = true; } |
| 79 void DidCompleteSwapBuffers() override {} | 80 void DidCompleteSwapBuffers() override {} |
| 80 | 81 |
| 81 // LayerTreeHostSingleThreadClient overrides. | 82 // LayerTreeHostSingleThreadClient overrides. |
| 82 void DidPostSwapBuffers() override {} | 83 void DidPostSwapBuffers() override {} |
| 83 void DidAbortSwapBuffers() override {} | 84 void DidAbortSwapBuffers() override {} |
| 84 | 85 |
| 85 void RunTest() { | 86 void RunTest() { |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 scoped_refptr<DelegatedFrameProvider> frame_provider_; | 232 scoped_refptr<DelegatedFrameProvider> frame_provider_; |
| 232 scoped_refptr<DelegatedRendererLayer> delegated_layer_; | 233 scoped_refptr<DelegatedRendererLayer> delegated_layer_; |
| 233 }; | 234 }; |
| 234 | 235 |
| 235 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { | 236 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { |
| 236 RunTest(); | 237 RunTest(); |
| 237 } | 238 } |
| 238 | 239 |
| 239 } // namespace | 240 } // namespace |
| 240 } // namespace cc | 241 } // namespace cc |
| OLD | NEW |