OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "blimp/client/feature/compositor/blimp_compositor.h" | 5 #include "blimp/client/feature/compositor/blimp_compositor.h" |
6 | 6 |
7 #include "base/thread_task_runner_handle.h" | 7 #include "base/thread_task_runner_handle.h" |
8 #include "blimp/client/feature/compositor/blimp_gpu_memory_buffer_manager.h" | 8 #include "blimp/client/feature/compositor/blimp_gpu_memory_buffer_manager.h" |
9 #include "blimp/client/feature/compositor/client_image_serialization_processor.h
" | 9 #include "blimp/client/feature/compositor/client_image_serialization_processor.h
" |
10 #include "blimp/common/compositor/blimp_task_graph_runner.h" | 10 #include "blimp/common/compositor/blimp_task_graph_runner.h" |
(...skipping 15 matching lines...) Expand all Loading... |
26 | 26 |
27 cc::LayerTreeSettings* GetLayerTreeSettings() override { return &settings_; } | 27 cc::LayerTreeSettings* GetLayerTreeSettings() override { return &settings_; } |
28 scoped_refptr<base::SingleThreadTaskRunner> GetCompositorTaskRunner() override | 28 scoped_refptr<base::SingleThreadTaskRunner> GetCompositorTaskRunner() override |
29 { return compositor_thread_.task_runner(); } | 29 { return compositor_thread_.task_runner(); } |
30 cc::TaskGraphRunner* GetTaskGraphRunner() override { | 30 cc::TaskGraphRunner* GetTaskGraphRunner() override { |
31 return &task_graph_runner_; } | 31 return &task_graph_runner_; } |
32 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override { | 32 gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override { |
33 return &gpu_memory_buffer_manager_; | 33 return &gpu_memory_buffer_manager_; |
34 } | 34 } |
35 cc::ImageSerializationProcessor* GetImageSerializationProcessor() override { | 35 cc::ImageSerializationProcessor* GetImageSerializationProcessor() override { |
36 return &image_serialization_processor_; | 36 return ClientImageSerializationProcessor::GetInstance(); |
37 } | 37 } |
38 void DidCompleteSwapBuffers() override {} | 38 void DidCompleteSwapBuffers() override {} |
39 | 39 |
40 void SendWebGestureEvent( | 40 void SendWebGestureEvent( |
41 int render_widget_id, | 41 int render_widget_id, |
42 const blink::WebGestureEvent& gesture_event) override { | 42 const blink::WebGestureEvent& gesture_event) override { |
43 MockableSendWebGestureEvent(render_widget_id); | 43 MockableSendWebGestureEvent(render_widget_id); |
44 } | 44 } |
45 void SendCompositorMessage( | 45 void SendCompositorMessage( |
46 int render_widget_id, | 46 int render_widget_id, |
47 const cc::proto::CompositorMessage& message) override { | 47 const cc::proto::CompositorMessage& message) override { |
48 MockableSendCompositorMessage(render_widget_id); | 48 MockableSendCompositorMessage(render_widget_id); |
49 } | 49 } |
50 | 50 |
51 MOCK_METHOD1(MockableSendWebGestureEvent, void(int)); | 51 MOCK_METHOD1(MockableSendWebGestureEvent, void(int)); |
52 MOCK_METHOD1(MockableSendCompositorMessage, void(int)); | 52 MOCK_METHOD1(MockableSendCompositorMessage, void(int)); |
53 | 53 |
54 cc::LayerTreeSettings settings_; | 54 cc::LayerTreeSettings settings_; |
55 base::Thread compositor_thread_; | 55 base::Thread compositor_thread_; |
56 BlimpTaskGraphRunner task_graph_runner_; | 56 BlimpTaskGraphRunner task_graph_runner_; |
57 BlimpGpuMemoryBufferManager gpu_memory_buffer_manager_; | 57 BlimpGpuMemoryBufferManager gpu_memory_buffer_manager_; |
58 ClientImageSerializationProcessor image_serialization_processor_; | |
59 }; | 58 }; |
60 | 59 |
61 class BlimpCompositorForTesting : public BlimpCompositor { | 60 class BlimpCompositorForTesting : public BlimpCompositor { |
62 public: | 61 public: |
63 BlimpCompositorForTesting(int render_widget_id, | 62 BlimpCompositorForTesting(int render_widget_id, |
64 BlimpCompositorClient* client) | 63 BlimpCompositorClient* client) |
65 : BlimpCompositor(render_widget_id, client) {} | 64 : BlimpCompositor(render_widget_id, client) {} |
66 | 65 |
67 void SendProto(const cc::proto::CompositorMessage& proto) { | 66 void SendProto(const cc::proto::CompositorMessage& proto) { |
68 SendCompositorProto(proto); | 67 SendCompositorProto(proto); |
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
168 MockableSendCompositorMessage(render_widget_id_)).Times(1); | 167 MockableSendCompositorMessage(render_widget_id_)).Times(1); |
169 EXPECT_CALL(compositor_client_, | 168 EXPECT_CALL(compositor_client_, |
170 MockableSendWebGestureEvent(render_widget_id_)).Times(1); | 169 MockableSendWebGestureEvent(render_widget_id_)).Times(1); |
171 | 170 |
172 compositor_->SendProto(cc::proto::CompositorMessage()); | 171 compositor_->SendProto(cc::proto::CompositorMessage()); |
173 compositor_->SendGestureEvent(blink::WebGestureEvent()); | 172 compositor_->SendGestureEvent(blink::WebGestureEvent()); |
174 } | 173 } |
175 | 174 |
176 } // namespace client | 175 } // namespace client |
177 } // namespace blimp | 176 } // namespace blimp |
OLD | NEW |