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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 no_loop_thread_(this, "LayerTreeHostNoMessageLoopTest") {} | 53 no_loop_thread_(this, "LayerTreeHostNoMessageLoopTest") {} |
54 virtual ~LayerTreeHostNoMessageLoopTest() {} | 54 virtual ~LayerTreeHostNoMessageLoopTest() {} |
55 | 55 |
56 // LayerTreeHostClient overrides. | 56 // LayerTreeHostClient overrides. |
57 void WillBeginMainFrame(int frame_id) override {} | 57 void WillBeginMainFrame(int frame_id) override {} |
58 void BeginMainFrame(const BeginFrameArgs& args) override {} | 58 void BeginMainFrame(const BeginFrameArgs& args) override {} |
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 float page_scale, | 64 float page_scale, |
64 float top_controls_delta) override {} | 65 float top_controls_delta) override {} |
65 void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, | 66 void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, |
66 float page_scale, | 67 float page_scale, |
67 float top_controls_delta) override {} | 68 float top_controls_delta) override {} |
68 void RequestNewOutputSurface(bool fallback) override { | 69 void RequestNewOutputSurface(bool fallback) override { |
69 layer_tree_host_->SetOutputSurface( | 70 layer_tree_host_->SetOutputSurface( |
70 make_scoped_ptr<OutputSurface>(new NoMessageLoopOutputSurface)); | 71 make_scoped_ptr<OutputSurface>(new NoMessageLoopOutputSurface)); |
71 } | 72 } |
72 void DidInitializeOutputSurface() override { | 73 void DidInitializeOutputSurface() override { |
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
230 scoped_refptr<DelegatedFrameProvider> frame_provider_; | 231 scoped_refptr<DelegatedFrameProvider> frame_provider_; |
231 scoped_refptr<DelegatedRendererLayer> delegated_layer_; | 232 scoped_refptr<DelegatedRendererLayer> delegated_layer_; |
232 }; | 233 }; |
233 | 234 |
234 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { | 235 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { |
235 RunTest(); | 236 RunTest(); |
236 } | 237 } |
237 | 238 |
238 } // namespace | 239 } // namespace |
239 } // namespace cc | 240 } // namespace cc |
OLD | NEW |