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 "cc/surfaces/surface.h" | 5 #include "cc/surfaces/surface.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "cc/base/container_util.h" | 9 #include "cc/base/container_util.h" |
10 #include "cc/output/compositor_frame.h" | 10 #include "cc/output/compositor_frame.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 } | 59 } |
60 | 60 |
61 // Empty frames shouldn't be drawn and shouldn't contribute damage, so don't | 61 // Empty frames shouldn't be drawn and shouldn't contribute damage, so don't |
62 // increment frame index for them. | 62 // increment frame index for them. |
63 if (current_frame_ && | 63 if (current_frame_ && |
64 !current_frame_->delegated_frame_data->render_pass_list.empty()) | 64 !current_frame_->delegated_frame_data->render_pass_list.empty()) |
65 ++frame_index_; | 65 ++frame_index_; |
66 | 66 |
67 std::vector<SurfaceId> new_referenced_surfaces; | 67 std::vector<SurfaceId> new_referenced_surfaces; |
68 if (current_frame_) { | 68 if (current_frame_) { |
69 for (auto& render_pass : | 69 new_referenced_surfaces = current_frame_->metadata.referenced_surfaces; |
70 current_frame_->delegated_frame_data->render_pass_list) { | |
71 new_referenced_surfaces.insert(new_referenced_surfaces.end(), | |
72 render_pass->referenced_surfaces.begin(), | |
73 render_pass->referenced_surfaces.end()); | |
74 } | |
75 } | 70 } |
76 | 71 |
77 if (previous_frame) { | 72 if (previous_frame) { |
78 ReturnedResourceArray previous_resources; | 73 ReturnedResourceArray previous_resources; |
79 TransferableResource::ReturnResources( | 74 TransferableResource::ReturnResources( |
80 previous_frame->delegated_frame_data->resource_list, | 75 previous_frame->delegated_frame_data->resource_list, |
81 &previous_resources); | 76 &previous_resources); |
82 factory_->UnrefResources(previous_resources); | 77 factory_->UnrefResources(previous_resources); |
83 } | 78 } |
84 if (!draw_callback_.is_null()) | 79 if (!draw_callback_.is_null()) |
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
198 if (current_frame_) { | 193 if (current_frame_) { |
199 for (const auto& render_pass : | 194 for (const auto& render_pass : |
200 current_frame_->delegated_frame_data->render_pass_list) { | 195 current_frame_->delegated_frame_data->render_pass_list) { |
201 for (const auto& copy_request : render_pass->copy_requests) | 196 for (const auto& copy_request : render_pass->copy_requests) |
202 copy_request->SendEmptyResult(); | 197 copy_request->SendEmptyResult(); |
203 } | 198 } |
204 } | 199 } |
205 } | 200 } |
206 | 201 |
207 } // namespace cc | 202 } // namespace cc |
OLD | NEW |