| Index: cc/surfaces/surface_aggregator.cc
|
| diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc
|
| index 941e2d89fab2be9a6c86a33c55bf6fd8cc170aa2..f2d5c270a64747f0d37c6bba7c4c778520f57da5 100644
|
| --- a/cc/surfaces/surface_aggregator.cc
|
| +++ b/cc/surfaces/surface_aggregator.cc
|
| @@ -131,23 +131,23 @@ int SurfaceAggregator::ChildIdForSurface(Surface* surface) {
|
| }
|
| }
|
|
|
| -static ResourceProvider::ResourceId ResourceRemapHelper(
|
| +static ResourceId ResourceRemapHelper(
|
| const ResourceProvider::ResourceIdMap& child_to_parent_map,
|
| - ResourceProvider::ResourceId id) {
|
| + ResourceId id) {
|
| ResourceProvider::ResourceIdMap::const_iterator it =
|
| child_to_parent_map.find(id);
|
| DCHECK(it != child_to_parent_map.end());
|
|
|
| DCHECK_EQ(it->first, id);
|
| - ResourceProvider::ResourceId remapped_id = it->second;
|
| + ResourceId remapped_id = it->second;
|
| return remapped_id;
|
| }
|
|
|
| -static ResourceProvider::ResourceId ValidateResourceHelper(
|
| +static ResourceId ValidateResourceHelper(
|
| 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()) {
|
|
|