| Index: cc/layers/delegated_renderer_layer_impl.cc
|
| diff --git a/cc/layers/delegated_renderer_layer_impl.cc b/cc/layers/delegated_renderer_layer_impl.cc
|
| index a99cd17b2c7bf74dd02d4bdda95d07b84e1aa3c9..5b6bc6cc3fff7c9cf45bab30afddc738919dc47e 100644
|
| --- a/cc/layers/delegated_renderer_layer_impl.cc
|
| +++ b/cc/layers/delegated_renderer_layer_impl.cc
|
| @@ -44,11 +44,11 @@ bool DelegatedRendererLayerImpl::HasContributingDelegatedRenderPasses() const {
|
| return render_passes_in_draw_order_.size() > 1;
|
| }
|
|
|
| -static ResourceProvider::ResourceId ResourceRemapHelper(
|
| +static ResourceId ResourceRemapHelper(
|
| bool* invalid_frame,
|
| const ResourceProvider::ResourceIdMap& child_to_parent_map,
|
| ResourceProvider::ResourceIdSet* resources_in_frame,
|
| - ResourceProvider::ResourceId id) {
|
| + ResourceId id) {
|
| ResourceProvider::ResourceIdMap::const_iterator it =
|
| child_to_parent_map.find(id);
|
| if (it == child_to_parent_map.end()) {
|
| @@ -57,7 +57,7 @@ static ResourceProvider::ResourceId ResourceRemapHelper(
|
| }
|
|
|
| DCHECK_EQ(it->first, id);
|
| - ResourceProvider::ResourceId remapped_id = it->second;
|
| + ResourceId remapped_id = it->second;
|
| resources_in_frame->insert(id);
|
| return remapped_id;
|
| }
|
|
|