| 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_aggregator.h" | 5 #include "cc/surfaces/surface_aggregator.h" |
| 6 | 6 |
| 7 #include <map> | 7 #include <map> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/containers/hash_tables.h" | 10 #include "base/containers/hash_tables.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/trace_event/trace_event.h" | 12 #include "base/trace_event/trace_event.h" |
| 13 #include "cc/base/math_util.h" | 13 #include "cc/base/math_util.h" |
| 14 #include "cc/output/compositor_frame.h" | 14 #include "cc/output/compositor_frame.h" |
| 15 #include "cc/output/delegated_frame_data.h" | 15 #include "cc/output/delegated_frame_data.h" |
| 16 #include "cc/quads/draw_quad.h" | 16 #include "cc/quads/draw_quad.h" |
| 17 #include "cc/quads/render_pass_draw_quad.h" | 17 #include "cc/quads/render_pass_draw_quad.h" |
| 18 #include "cc/quads/shared_quad_state.h" | 18 #include "cc/quads/shared_quad_state.h" |
| 19 #include "cc/quads/surface_draw_quad.h" | 19 #include "cc/quads/surface_draw_quad.h" |
| 20 #include "cc/surfaces/surface.h" | 20 #include "cc/surfaces/surface.h" |
| 21 #include "cc/surfaces/surface_factory.h" | 21 #include "cc/surfaces/surface_factory.h" |
| 22 #include "cc/surfaces/surface_manager.h" | 22 #include "cc/surfaces/surface_manager.h" |
| 23 #include "cc/trees/blocking_task_runner.h" | |
| 24 | 23 |
| 25 namespace cc { | 24 namespace cc { |
| 26 namespace { | 25 namespace { |
| 27 | 26 |
| 28 void MoveMatchingRequests( | 27 void MoveMatchingRequests( |
| 29 RenderPassId id, | 28 RenderPassId id, |
| 30 std::multimap<RenderPassId, CopyOutputRequest*>* copy_requests, | 29 std::multimap<RenderPassId, CopyOutputRequest*>* copy_requests, |
| 31 ScopedPtrVector<CopyOutputRequest>* output_requests) { | 30 ScopedPtrVector<CopyOutputRequest>* output_requests) { |
| 32 auto request_range = copy_requests->equal_range(id); | 31 auto request_range = copy_requests->equal_range(id); |
| 33 for (auto it = request_range.first; it != request_range.second; ++it) { | 32 for (auto it = request_range.first; it != request_range.second; ++it) { |
| (...skipping 470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 504 void SurfaceAggregator::ReleaseResources(SurfaceId surface_id) { | 503 void SurfaceAggregator::ReleaseResources(SurfaceId surface_id) { |
| 505 SurfaceToResourceChildIdMap::iterator it = | 504 SurfaceToResourceChildIdMap::iterator it = |
| 506 surface_id_to_resource_child_id_.find(surface_id); | 505 surface_id_to_resource_child_id_.find(surface_id); |
| 507 if (it != surface_id_to_resource_child_id_.end()) { | 506 if (it != surface_id_to_resource_child_id_.end()) { |
| 508 provider_->DestroyChild(it->second); | 507 provider_->DestroyChild(it->second); |
| 509 surface_id_to_resource_child_id_.erase(it); | 508 surface_id_to_resource_child_id_.erase(it); |
| 510 } | 509 } |
| 511 } | 510 } |
| 512 | 511 |
| 513 } // namespace cc | 512 } // namespace cc |
| OLD | NEW |