Move sync point from TransferResourceList to individual TransferResources

cc/resource_provider.h

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CC_RESOURCE_PROVIDER_H_
 #define CC_RESOURCE_PROVIDER_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 105 matching lines @@
     // Destroys accounting for the child, deleting all accounted resources.
     void destroyChild(int child);
 
     // Gets the child->parent resource ID map.
     const ResourceIdMap& getChildToParentMap(int child) const;
 
     // Prepares resources to be transfered to the parent, moving them to
     // mailboxes and serializing meta-data into TransferableResources.
     // Resources are not removed from the ResourceProvider, but are marked as
     // "in use".
-    void prepareSendToParent(const ResourceIdArray&, TransferableResourceList*);
+    void prepareSendToParent(const ResourceIdArray& resources, TransferableResourceArray* transferableResources);
 
     // Prepares resources to be transfered back to the child, moving them to
     // mailboxes and serializing meta-data into TransferableResources.
     // Resources are removed from the ResourceProvider. Note: the resource IDs
     // passed are in the parent namespace and will be translated to the child
     // namespace when returned.
-    void prepareSendToChild(int child, const ResourceIdArray&, TransferableResourceList*);
+    void prepareSendToChild(int child, const ResourceIdArray& resources, TransferableResourceArray* transferableResources);
 
     // Receives resources from a child, moving them from mailboxes. Resource IDs
     // passed are in the child namespace, and will be translated to the parent
     // namespace, added to the child->parent map.
-    // NOTE: if the syncPoint filed in TransferableResourceList is set, this
-    // will wait on it.
-    void receiveFromChild(int child, const TransferableResourceList&);
+    // NOTE: if the sync_point is set on any TransferableResource, this will
+    // wait on it.
+    void receiveFromChild(int child, const TransferableResourceArray& transferableResources);
 
     // Receives resources from the parent, moving them from mailboxes. Resource IDs
     // passed are in the child namespace.
-    // NOTE: if the syncPoint filed in TransferableResourceList is set, this
-    // will wait on it.
-    void receiveFromParent(const TransferableResourceList&);
+    // NOTE: if the sync_point is set on any TransferableResource, this will
+    // wait on it.
+    void receiveFromParent(const TransferableResourceArray& transferableResources);
 
     // Bind the given GL resource to a texture target for sampling using the
     // specified filter for both minification and magnification. The resource
     // must be locked for reading.
     void bindForSampling(ResourceProvider::ResourceId, GLenum target, GLenum filter);
 
     // The following lock classes are part of the ResourceProvider API and are
     // needed to read and write the resource contents. The user must ensure
     // that they only use GL locks on GL resources, etc, and this is enforced
     // by assertions.
@@ skipping 186 matching lines @@
     base::ThreadChecker m_threadChecker;
 
     scoped_refptr<Fence> m_currentReadLockFence;
 
     DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 }
 
 #endif  // CC_RESOURCE_PROVIDER_H_