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 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
50 did_commit_and_draw_frame_(false), | 50 did_commit_and_draw_frame_(false), |
51 size_(100, 100), | 51 size_(100, 100), |
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 BeginMainFrame(const BeginFrameArgs& args) OVERRIDE {} | 57 virtual void BeginMainFrame(const BeginFrameArgs& args) OVERRIDE {} |
58 virtual void DidBeginMainFrame() OVERRIDE {} | 58 virtual void DidBeginMainFrame() OVERRIDE {} |
59 virtual void Layout() OVERRIDE {} | 59 virtual void Layout() OVERRIDE {} |
60 virtual void ApplyScrollAndScale(const gfx::Vector2d& scroll_delta, | 60 virtual void ApplyViewportDeltas(const gfx::Vector2d& scroll_delta, |
61 float page_scale) OVERRIDE {} | 61 float page_scale, |
| 62 float top_controls_delta) OVERRIDE {} |
62 virtual scoped_ptr<OutputSurface> CreateOutputSurface( | 63 virtual scoped_ptr<OutputSurface> CreateOutputSurface( |
63 bool fallback) OVERRIDE { | 64 bool fallback) OVERRIDE { |
64 return make_scoped_ptr<OutputSurface>(new NoMessageLoopOutputSurface); | 65 return make_scoped_ptr<OutputSurface>(new NoMessageLoopOutputSurface); |
65 } | 66 } |
66 virtual void DidInitializeOutputSurface() OVERRIDE { | 67 virtual void DidInitializeOutputSurface() OVERRIDE { |
67 did_initialize_output_surface_ = true; | 68 did_initialize_output_surface_ = true; |
68 } | 69 } |
69 virtual void WillCommit() OVERRIDE {} | 70 virtual void WillCommit() OVERRIDE {} |
70 virtual void DidCommit() OVERRIDE { did_commit_ = true; } | 71 virtual void DidCommit() OVERRIDE { did_commit_ = true; } |
71 virtual void DidCommitAndDrawFrame() OVERRIDE { | 72 virtual void DidCommitAndDrawFrame() OVERRIDE { |
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
226 scoped_refptr<DelegatedFrameProvider> frame_provider_; | 227 scoped_refptr<DelegatedFrameProvider> frame_provider_; |
227 scoped_refptr<DelegatedRendererLayer> delegated_layer_; | 228 scoped_refptr<DelegatedRendererLayer> delegated_layer_; |
228 }; | 229 }; |
229 | 230 |
230 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { | 231 TEST_F(LayerTreeHostNoMessageLoopDelegatedLayer, SingleDelegatedLayer) { |
231 RunTest(); | 232 RunTest(); |
232 } | 233 } |
233 | 234 |
234 } // namespace | 235 } // namespace |
235 } // namespace cc | 236 } // namespace cc |
OLD | NEW |