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

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

Issue 23097005: cc: return resources via a ReturnedResource struct rather than TransferableResource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review nits Created 7 years, 4 months 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 | Annotate | Revision Log
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl.h ('k') | cc/layers/texture_layer_unittest.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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 } 138 }
139 139
140 // Save the remapped quads on the layer. This steals the quads and render 140 // Save the remapped quads on the layer. This steals the quads and render
141 // passes from the frame_data. 141 // passes from the frame_data.
142 SetRenderPasses(&frame_data->render_pass_list); 142 SetRenderPasses(&frame_data->render_pass_list);
143 resources_.swap(used_resources); 143 resources_.swap(used_resources);
144 have_render_passes_to_push_ = true; 144 have_render_passes_to_push_ = true;
145 } 145 }
146 146
147 void DelegatedRendererLayerImpl::CollectUnusedResources( 147 void DelegatedRendererLayerImpl::CollectUnusedResources(
148 TransferableResourceArray* resources_for_ack) { 148 ReturnedResourceArray* resources_for_ack) {
149 CreateChildIdIfNeeded(); 149 CreateChildIdIfNeeded();
150 DCHECK(child_id_); 150 DCHECK(child_id_);
151 151
152 ResourceProvider* resource_provider = layer_tree_impl()->resource_provider(); 152 ResourceProvider* resource_provider = layer_tree_impl()->resource_provider();
153 const ResourceProvider::ResourceIdMap& resource_map = 153 const ResourceProvider::ResourceIdMap& resource_map =
154 resource_provider->GetChildToParentMap(child_id_); 154 resource_provider->GetChildToParentMap(child_id_);
155 155
156 ResourceProvider::ResourceIdArray unused_resources; 156 ResourceProvider::ResourceIdArray unused_resources;
157 for (ResourceProvider::ResourceIdMap::const_iterator it = 157 for (ResourceProvider::ResourceIdMap::const_iterator it =
158 resource_map.begin(); 158 resource_map.begin();
159 it != resource_map.end(); 159 it != resource_map.end();
160 ++it) { 160 ++it) {
161 bool resource_is_in_current_frame = resources_.count(it->second) > 0; 161 bool resource_is_in_current_frame = resources_.count(it->second) > 0;
162 bool resource_is_in_use = resource_provider->InUseByConsumer(it->second); 162 bool resource_is_in_use = resource_provider->InUseByConsumer(it->second);
163 if (!resource_is_in_current_frame && !resource_is_in_use) 163 if (!resource_is_in_current_frame && !resource_is_in_use)
164 unused_resources.push_back(it->second); 164 unused_resources.push_back(it->second);
165 } 165 }
166 resource_provider->PrepareSendToChild( 166 resource_provider->PrepareSendReturnsToChild(
167 child_id_, unused_resources, resources_for_ack); 167 child_id_, unused_resources, resources_for_ack);
168 } 168 }
169 169
170 void DelegatedRendererLayerImpl::SetDisplaySize(gfx::Size size) { 170 void DelegatedRendererLayerImpl::SetDisplaySize(gfx::Size size) {
171 if (display_size_ == size) 171 if (display_size_ == size)
172 return; 172 return;
173 display_size_ = size; 173 display_size_ = size;
174 NoteLayerPropertyChanged(); 174 NoteLayerPropertyChanged();
175 } 175 }
176 176
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 480
481 if (own_child_id_) { 481 if (own_child_id_) {
482 ResourceProvider* provider = layer_tree_impl()->resource_provider(); 482 ResourceProvider* provider = layer_tree_impl()->resource_provider();
483 provider->DestroyChild(child_id_); 483 provider->DestroyChild(child_id_);
484 } 484 }
485 485
486 child_id_ = 0; 486 child_id_ = 0;
487 } 487 }
488 488
489 } // namespace cc 489 } // namespace cc
OLDNEW
« no previous file with comments | « cc/layers/delegated_renderer_layer_impl.h ('k') | cc/layers/texture_layer_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698