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 "content/public/test/test_synchronous_compositor_android.h" | 5 #include "content/public/test/test_synchronous_compositor_android.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "cc/output/compositor_frame.h" | 9 #include "cc/output/compositor_frame.h" |
10 | 10 |
(...skipping 15 matching lines...) Expand all Loading... |
26 client_->DidInitializeCompositor(this, process_id_, routing_id_); | 26 client_->DidInitializeCompositor(this, process_id_, routing_id_); |
27 } | 27 } |
28 | 28 |
29 SynchronousCompositor::Frame TestSynchronousCompositor::DemandDrawHw( | 29 SynchronousCompositor::Frame TestSynchronousCompositor::DemandDrawHw( |
30 const gfx::Size& viewport_size, | 30 const gfx::Size& viewport_size, |
31 const gfx::Rect& viewport_rect_for_tile_priority, | 31 const gfx::Rect& viewport_rect_for_tile_priority, |
32 const gfx::Transform& transform_for_tile_priority) { | 32 const gfx::Transform& transform_for_tile_priority) { |
33 return std::move(hardware_frame_); | 33 return std::move(hardware_frame_); |
34 } | 34 } |
35 | 35 |
36 void TestSynchronousCompositor::DemandDrawHwAsync( | 36 scoped_refptr<SynchronousCompositor::FrameFuture> |
| 37 TestSynchronousCompositor::DemandDrawHwAsync( |
37 const gfx::Size& viewport_size, | 38 const gfx::Size& viewport_size, |
38 const gfx::Rect& viewport_rect_for_tile_priority, | 39 const gfx::Rect& viewport_rect_for_tile_priority, |
39 const gfx::Transform& transform_for_tile_priority) {} | 40 const gfx::Transform& transform_for_tile_priority) { |
| 41 return nullptr; |
| 42 } |
40 | 43 |
41 void TestSynchronousCompositor::ReturnResources( | 44 void TestSynchronousCompositor::ReturnResources( |
42 uint32_t compositor_frame_sink_id, | 45 uint32_t compositor_frame_sink_id, |
43 const cc::ReturnedResourceArray& resources) { | 46 const cc::ReturnedResourceArray& resources) { |
44 ReturnedResources returned_resources; | 47 ReturnedResources returned_resources; |
45 returned_resources.compositor_frame_sink_id = compositor_frame_sink_id; | 48 returned_resources.compositor_frame_sink_id = compositor_frame_sink_id; |
46 returned_resources.resources = resources; | 49 returned_resources.resources = resources; |
47 frame_ack_array_.push_back(returned_resources); | 50 frame_ack_array_.push_back(returned_resources); |
48 } | 51 } |
49 | 52 |
(...skipping 16 matching lines...) Expand all Loading... |
66 | 69 |
67 TestSynchronousCompositor::ReturnedResources::ReturnedResources() | 70 TestSynchronousCompositor::ReturnedResources::ReturnedResources() |
68 : compositor_frame_sink_id(0u) {} | 71 : compositor_frame_sink_id(0u) {} |
69 | 72 |
70 TestSynchronousCompositor::ReturnedResources::ReturnedResources( | 73 TestSynchronousCompositor::ReturnedResources::ReturnedResources( |
71 const ReturnedResources& other) = default; | 74 const ReturnedResources& other) = default; |
72 | 75 |
73 TestSynchronousCompositor::ReturnedResources::~ReturnedResources() {} | 76 TestSynchronousCompositor::ReturnedResources::~ReturnedResources() {} |
74 | 77 |
75 } // namespace content | 78 } // namespace content |
OLD | NEW |