Separate TransferableResource into own header

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 CCResourceProvider_h
 #define CCResourceProvider_h
 
 #include "base/basictypes.h"
 #include "base/hash_tables.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/cc_export.h"
 #include "cc/graphics_context.h"
 #include "cc/texture_copier.h"
+#include "cc/transferable_resource.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/size.h"
 #include <deque>
 #include <vector>
 
 namespace WebKit {
 class WebGraphicsContext3D;
 }
@@ skipping 12 matching lines @@
 class CC_EXPORT ResourceProvider {
 public:
     typedef unsigned ResourceId;
     typedef std::vector<ResourceId> ResourceIdArray;
     typedef base::hash_map<ResourceId, ResourceId> ResourceIdMap;
     enum TextureUsageHint { TextureUsageAny, TextureUsageFramebuffer };
     enum ResourceType {
         GLTexture = 1,
         Bitmap,
     };
-    struct Mailbox {
-        GLbyte name[64];
-    };
-    struct TransferableResource {
-        unsigned id;
-        GLenum format;
-        gfx::Size size;
-        Mailbox mailbox;
-    };
-    typedef std::vector<TransferableResource> TransferableResourceArray;
-    struct CC_EXPORT TransferableResourceList {
-        TransferableResourceList();
-        ~TransferableResourceList();
-
-        TransferableResourceArray resources;
-        unsigned syncPoint;
-    };
 
     static scoped_ptr<ResourceProvider> create(GraphicsContext*);
 
     virtual ~ResourceProvider();
 
+    GraphicsContext* context() const { return m_context; }

[danakj, 2012/11/03 01:00:51]

Why'd you add this one? I don't see any users.

[piman, 2012/11/03 01:05:47]

Done.

     WebKit::WebGraphicsContext3D* graphicsContext3D();
     TextureCopier* textureCopier() const { return m_textureCopier.get(); }
     int maxTextureSize() const { return m_maxTextureSize; }
     unsigned numResources() const { return m_resources.size(); }
 
     // Checks whether a resource is in use by a consumer.
     bool inUseByConsumer(ResourceId);
 
 
     // Producer interface.
@@ skipping 37 matching lines @@
     int createChild(int pool);
 
     // Destroys accounting for the child, deleting all resources from that pool.
     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 markes as
+    // Resources are not removed from the ResourceProvider, but are marked as
     // "in use".
-    TransferableResourceList prepareSendToParent(const ResourceIdArray&);
+    void prepareSendToParent(const ResourceIdArray&, TransferableResourceList*);
 
     // 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.
-    TransferableResourceList prepareSendToChild(int child, const ResourceIdArray&);
+    void prepareSendToChild(int child, const ResourceIdArray&, TransferableResourceList*);
 
     // 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&);
 
     // Receives resources from the parent, moving them from mailboxes. Resource IDs
     // passed are in the child namespace.
@@ skipping 131 matching lines @@
     scoped_ptr<TextureUploader> m_textureUploader;
     scoped_ptr<AcceleratedTextureCopier> m_textureCopier;
     int m_maxTextureSize;
 
     DISALLOW_COPY_AND_ASSIGN(ResourceProvider);
 };
 
 }
 
 #endif