cc: return resources via a ReturnedResource struct rather than TransferableResource

cc/resources/resource_provider.h

Index: cc/resources/resource_provider.h
diff --git a/cc/resources/resource_provider.h b/cc/resources/resource_provider.h
index 29647e227ceaa360d6ef9777ae4db97ff5bfbd83..be7d903bb8ec5bed69beba973d669068580c11a3 100644
--- a/cc/resources/resource_provider.h
+++ b/cc/resources/resource_provider.h
@@ -155,7 +155,7 @@ class CC_EXPORT ResourceProvider {
   // namespace when returned.
   void PrepareSendToChild(int child,
                           const ResourceIdArray& resources,
-                          TransferableResourceArray* transferable_resources);
+                          ReturnedResourceArray* returned_resources);
 
   // Receives resources from a child, moving them from mailboxes. Resource IDs
   // passed are in the child namespace, and will be translated to the parent
@@ -169,8 +169,7 @@ class CC_EXPORT ResourceProvider {
   // IDs passed are in the child namespace.
   // NOTE: if the sync_point is set on any TransferableResource, this will
   // wait on it.
-  void ReceiveFromParent(
-      const TransferableResourceArray& transferable_resources);
+  void ReceiveFromParent(const ReturnedResourceArray& transferable_resources);
 
   // The following lock classes are part of the ResourceProvider API and are
   // needed to read and write the resource contents. The user must ensure
@@ -393,6 +392,7 @@ class CC_EXPORT ResourceProvider {
 
   void CleanUpGLIfNeeded();
 
+  Resource* GetResource(ResourceId id);
   const Resource* LockForRead(ResourceId id);
   void UnlockForRead(ResourceId id);
   const Resource* LockForWrite(ResourceId id);