OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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/layers/delegated_renderer_layer_impl.h" | 5 #include "cc/layers/delegated_renderer_layer_impl.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <algorithm> | 10 #include <algorithm> |
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 resource_provider->GetChildToParentMap(child_id_); | 102 resource_provider->GetChildToParentMap(child_id_); |
103 | 103 |
104 resource_provider->ReceiveFromChild(child_id_, frame_data->resource_list); | 104 resource_provider->ReceiveFromChild(child_id_, frame_data->resource_list); |
105 | 105 |
106 RenderPassList render_pass_list; | 106 RenderPassList render_pass_list; |
107 RenderPass::CopyAll(frame_data->render_pass_list, &render_pass_list); | 107 RenderPass::CopyAll(frame_data->render_pass_list, &render_pass_list); |
108 | 108 |
109 bool invalid_frame = false; | 109 bool invalid_frame = false; |
110 ResourceProvider::ResourceIdSet resources_in_frame; | 110 ResourceProvider::ResourceIdSet resources_in_frame; |
111 size_t reserve_size = frame_data->resource_list.size(); | 111 size_t reserve_size = frame_data->resource_list.size(); |
| 112 #if defined(COMPILER_MSVC) |
112 resources_in_frame.reserve(reserve_size); | 113 resources_in_frame.reserve(reserve_size); |
| 114 #elif defined(COMPILER_GCC) |
| 115 // Pre-standard hash-tables only implement resize, which behaves similarly |
| 116 // to reserve for these keys. Resizing to 0 may also be broken (particularly |
| 117 // on stlport). |
| 118 // TODO(jbauman): Replace with reserve when C++11 is supported everywhere. |
| 119 if (reserve_size) |
| 120 resources_in_frame.resize(reserve_size); |
| 121 #endif |
113 for (const auto& pass : render_pass_list) { | 122 for (const auto& pass : render_pass_list) { |
114 for (const auto& quad : pass->quad_list) { | 123 for (const auto& quad : pass->quad_list) { |
115 for (ResourceId& resource_id : quad->resources) { | 124 for (ResourceId& resource_id : quad->resources) { |
116 ResourceProvider::ResourceIdMap::const_iterator it = | 125 ResourceProvider::ResourceIdMap::const_iterator it = |
117 resource_map.find(resource_id); | 126 resource_map.find(resource_id); |
118 if (it == resource_map.end()) { | 127 if (it == resource_map.end()) { |
119 invalid_frame = true; | 128 invalid_frame = true; |
120 break; | 129 break; |
121 } | 130 } |
122 | 131 |
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
506 if (own_child_id_) { | 515 if (own_child_id_) { |
507 ResourceProvider* provider = layer_tree_impl()->resource_provider(); | 516 ResourceProvider* provider = layer_tree_impl()->resource_provider(); |
508 provider->DestroyChild(child_id_); | 517 provider->DestroyChild(child_id_); |
509 } | 518 } |
510 | 519 |
511 resources_.clear(); | 520 resources_.clear(); |
512 child_id_ = 0; | 521 child_id_ = 0; |
513 } | 522 } |
514 | 523 |
515 } // namespace cc | 524 } // namespace cc |
OLD | NEW |