| 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 51 frame_ack_array_.swap(*array); | 51 frame_ack_array_.swap(*array); |
| 52 } | 52 } |
| 53 | 53 |
| 54 bool TestSynchronousCompositor::DemandDrawSw(SkCanvas* canvas) { | 54 bool TestSynchronousCompositor::DemandDrawSw(SkCanvas* canvas) { |
| 55 DCHECK(canvas); | 55 DCHECK(canvas); |
| 56 return true; | 56 return true; |
| 57 } | 57 } |
| 58 | 58 |
| 59 void TestSynchronousCompositor::SetHardwareFrame( | 59 void TestSynchronousCompositor::SetHardwareFrame( |
| 60 uint32_t output_surface_id, | 60 uint32_t output_surface_id, |
| 61 scoped_ptr<cc::CompositorFrame> frame) { | 61 std::unique_ptr<cc::CompositorFrame> frame) { |
| 62 hardware_frame_.output_surface_id = output_surface_id; | 62 hardware_frame_.output_surface_id = output_surface_id; |
| 63 hardware_frame_.frame = std::move(frame); | 63 hardware_frame_.frame = std::move(frame); |
| 64 } | 64 } |
| 65 | 65 |
| 66 TestSynchronousCompositor::ReturnedResources::ReturnedResources() | 66 TestSynchronousCompositor::ReturnedResources::ReturnedResources() |
| 67 : output_surface_id(0u) {} | 67 : output_surface_id(0u) {} |
| 68 | 68 |
| 69 TestSynchronousCompositor::ReturnedResources::~ReturnedResources() {} | 69 TestSynchronousCompositor::ReturnedResources::~ReturnedResources() {} |
| 70 | 70 |
| 71 } // namespace content | 71 } // namespace content |
| OLD | NEW |