Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: cc/layers/delegated_renderer_layer_impl.cc

Issue 1502373009: Allow std::unordered_*. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include. What. You. Use. Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/debug/picture_debug_util.cc ('k') | cc/surfaces/surface_aggregator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <algorithm> 7 #include <algorithm>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 resource_provider->GetChildToParentMap(child_id_); 99 resource_provider->GetChildToParentMap(child_id_);
100 100
101 resource_provider->ReceiveFromChild(child_id_, frame_data->resource_list); 101 resource_provider->ReceiveFromChild(child_id_, frame_data->resource_list);
102 102
103 RenderPassList render_pass_list; 103 RenderPassList render_pass_list;
104 RenderPass::CopyAll(frame_data->render_pass_list, &render_pass_list); 104 RenderPass::CopyAll(frame_data->render_pass_list, &render_pass_list);
105 105
106 bool invalid_frame = false; 106 bool invalid_frame = false;
107 ResourceProvider::ResourceIdSet resources_in_frame; 107 ResourceProvider::ResourceIdSet resources_in_frame;
108 size_t reserve_size = frame_data->resource_list.size(); 108 size_t reserve_size = frame_data->resource_list.size();
109 #if defined(COMPILER_MSVC)
110 resources_in_frame.reserve(reserve_size); 109 resources_in_frame.reserve(reserve_size);
111 #elif defined(COMPILER_GCC)
112 // Pre-standard hash-tables only implement resize, which behaves similarly
113 // to reserve for these keys. Resizing to 0 may also be broken (particularly
114 // on stlport).
115 // TODO(jbauman): Replace with reserve when C++11 is supported everywhere.
116 if (reserve_size)
117 resources_in_frame.resize(reserve_size);
118 #endif
119 for (const auto& pass : render_pass_list) { 110 for (const auto& pass : render_pass_list) {
120 for (const auto& quad : pass->quad_list) { 111 for (const auto& quad : pass->quad_list) {
121 for (ResourceId& resource_id : quad->resources) { 112 for (ResourceId& resource_id : quad->resources) {
122 ResourceProvider::ResourceIdMap::const_iterator it = 113 ResourceProvider::ResourceIdMap::const_iterator it =
123 resource_map.find(resource_id); 114 resource_map.find(resource_id);
124 if (it == resource_map.end()) { 115 if (it == resource_map.end()) {
125 invalid_frame = true; 116 invalid_frame = true;
126 break; 117 break;
127 } 118 }
128 119
(...skipping 383 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 if (own_child_id_) { 503 if (own_child_id_) {
513 ResourceProvider* provider = layer_tree_impl()->resource_provider(); 504 ResourceProvider* provider = layer_tree_impl()->resource_provider();
514 provider->DestroyChild(child_id_); 505 provider->DestroyChild(child_id_);
515 } 506 }
516 507
517 resources_.clear(); 508 resources_.clear();
518 child_id_ = 0; 509 child_id_ = 0;
519 } 510 }
520 511
521 } // namespace cc 512 } // namespace cc
OLDNEW
« no previous file with comments | « cc/debug/picture_debug_util.cc ('k') | cc/surfaces/surface_aggregator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698