| Index: cc/resources/resource_provider.h
|
| diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
|
| index c323d4282ed60d539155a9fafa87495a9ba6e366..2ca4ba19e1cc14ab55bd5638241083743c25db52 100644
|
| --- a/cc/resources/resource_provider.h
|
| +++ b/cc/resources/resource_provider.h
|
| @@ -619,6 +619,7 @@ class CC_EXPORT ResourceProvider
|
| void WaitSyncToken(gpu::gles2::GLES2Interface* gl);
|
|
|
| int child_id;
|
| + ResourceId id_in_child;
|
| unsigned gl_id;
|
| // Pixel buffer used for set pixels without unnecessary copying.
|
| unsigned gl_pixel_buffer_id;
|
| @@ -696,7 +697,6 @@ class CC_EXPORT ResourceProvider
|
| ~Child();
|
|
|
| ResourceIdMap child_to_parent_map;
|
| - ResourceIdMap parent_to_child_map;
|
| ReturnCallback return_callback;
|
| bool marked_for_deletion;
|
| bool needs_sync_tokens;
|
|
|