| 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 "cc/test/test_compositor_frame_sink.h" | 5 #include "cc/test/test_compositor_frame_sink.h" |
| 6 | 6 |
| 7 #include <stdint.h> | 7 #include <stdint.h> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "cc/output/begin_frame_args.h" | 10 #include "cc/output/begin_frame_args.h" |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 104 display_->renderer_for_testing()->SetEnlargePassTextureAmountForTesting( | 104 display_->renderer_for_testing()->SetEnlargePassTextureAmountForTesting( |
| 105 enlarge_pass_texture_amount_); | 105 enlarge_pass_texture_amount_); |
| 106 display_->SetVisible(true); | 106 display_->SetVisible(true); |
| 107 bound_ = true; | 107 bound_ = true; |
| 108 return true; | 108 return true; |
| 109 } | 109 } |
| 110 | 110 |
| 111 void TestCompositorFrameSink::DetachFromClient() { | 111 void TestCompositorFrameSink::DetachFromClient() { |
| 112 // Some tests make BindToClient fail on purpose. ^__^ | 112 // Some tests make BindToClient fail on purpose. ^__^ |
| 113 if (bound_) { | 113 if (bound_) { |
| 114 if (delegated_local_frame_id_.is_valid()) | |
| 115 surface_factory_->Destroy(delegated_local_frame_id_); | |
| 116 surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_); | 114 surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_); |
| 117 surface_manager_->InvalidateFrameSinkId(frame_sink_id_); | 115 surface_manager_->InvalidateFrameSinkId(frame_sink_id_); |
| 118 display_ = nullptr; | 116 display_ = nullptr; |
| 119 bound_ = false; | 117 bound_ = false; |
| 120 } | 118 } |
| 121 surface_factory_ = nullptr; | 119 surface_factory_ = nullptr; |
| 122 surface_id_allocator_ = nullptr; | 120 surface_id_allocator_ = nullptr; |
| 123 surface_manager_ = nullptr; | 121 surface_manager_ = nullptr; |
| 124 test_client_ = nullptr; | 122 test_client_ = nullptr; |
| 125 CompositorFrameSink::DetachFromClient(); | 123 CompositorFrameSink::DetachFromClient(); |
| 126 } | 124 } |
| 127 | 125 |
| 128 void TestCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) { | 126 void TestCompositorFrameSink::SubmitCompositorFrame(CompositorFrame frame) { |
| 129 test_client_->DisplayReceivedCompositorFrame(frame); | 127 test_client_->DisplayReceivedCompositorFrame(frame); |
| 130 | 128 |
| 131 if (!delegated_local_frame_id_.is_valid()) { | 129 if (!delegated_local_frame_id_.is_valid()) { |
| 132 delegated_local_frame_id_ = surface_id_allocator_->GenerateId(); | 130 delegated_local_frame_id_ = surface_id_allocator_->GenerateId(); |
| 133 surface_factory_->Create(delegated_local_frame_id_); | |
| 134 } | 131 } |
| 135 display_->SetSurfaceId(SurfaceId(frame_sink_id_, delegated_local_frame_id_), | 132 display_->SetSurfaceId(SurfaceId(frame_sink_id_, delegated_local_frame_id_), |
| 136 frame.metadata.device_scale_factor); | 133 frame.metadata.device_scale_factor); |
| 137 | 134 |
| 138 gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size(); | 135 gfx::Size frame_size = frame.render_pass_list.back()->output_rect.size(); |
| 139 display_->Resize(frame_size); | 136 display_->Resize(frame_size); |
| 140 | 137 |
| 141 bool synchronous = !display_->has_scheduler(); | 138 bool synchronous = !display_->has_scheduler(); |
| 142 | 139 |
| 143 SurfaceFactory::DrawCallback draw_callback; | 140 SurfaceFactory::DrawCallback draw_callback; |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 202 bool will_draw_and_swap, | 199 bool will_draw_and_swap, |
| 203 const RenderPassList& render_passes) { | 200 const RenderPassList& render_passes) { |
| 204 test_client_->DisplayWillDrawAndSwap(will_draw_and_swap, render_passes); | 201 test_client_->DisplayWillDrawAndSwap(will_draw_and_swap, render_passes); |
| 205 } | 202 } |
| 206 | 203 |
| 207 void TestCompositorFrameSink::DisplayDidDrawAndSwap() { | 204 void TestCompositorFrameSink::DisplayDidDrawAndSwap() { |
| 208 test_client_->DisplayDidDrawAndSwap(); | 205 test_client_->DisplayDidDrawAndSwap(); |
| 209 } | 206 } |
| 210 | 207 |
| 211 } // namespace cc | 208 } // namespace cc |
| OLD | NEW |