Add CCDelegatingRenderer, and corresponding IPCs

cc/CCResourceProvider.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 "CCGraphicsContext.h"
 #include "GraphicsContext3D.h"
@@ skipping 10 matching lines @@
 #include <wtf/Vector.h>
 
 namespace WebKit {
 class WebGraphicsContext3D;
 }
 
 namespace cc {
 
 class IntRect;
 class LayerTextureSubImage;
+struct Mailbox;
 class TextureCopier;
 class TextureUploader;
+struct TransferableResource;
+struct TransferableResourceList;
 
 // Thread-safety notes: this class is not thread-safe and can only be called
 // from the thread it was created on (in practice, the compositor thread).
 class CCResourceProvider {
 public:
     typedef unsigned ResourceId;
     typedef Vector<ResourceId> ResourceIdArray;
     typedef HashMap<ResourceId, ResourceId> ResourceIdMap;
     enum TextureUsageHint { TextureUsageAny, TextureUsageFramebuffer };
     enum ResourceType {
         GLTexture = 1,
         Bitmap,
     };
-    struct Mailbox {
-        GC3Dbyte name[64];
-    };
-    struct TransferableResource {
-        unsigned id;
-        GC3Denum format;
-        IntSize size;
-        Mailbox mailbox;
-    };
-    typedef Vector<TransferableResource> TransferableResourceArray;
-    struct TransferableResourceList {
-        TransferableResourceList();
-        ~TransferableResourceList();
-
-        TransferableResourceArray resources;
-        unsigned syncPoint;
-    };
-
     static PassOwnPtr<CCResourceProvider> create(CCGraphicsContext*);
 
     virtual ~CCResourceProvider();
 
+    CCGraphicsContext* context() const { return m_context; }
     WebKit::WebGraphicsContext3D* graphicsContext3D();
     TextureUploader* textureUploader() const { return m_textureUploader.get(); }
     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);
 
 
@@ skipping 33 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 CCResourceProvider, but are markes as
+    // Resources are not removed from the CCResourceProvider, 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 CCResourceProvider. 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 75 matching lines @@
         Resource(unsigned textureId, int pool, const IntSize& size, GC3Denum format);
         Resource(uint8_t* pixels, int pool, const IntSize& size, GC3Denum format);
 
         unsigned glId;
         uint8_t* pixels;
         int pool;
         int lockForReadCount;
         bool lockedForWrite;
         bool external;
         bool exported;
-        bool markedForDeletion;
+        bool deleted;
         IntSize size;
         GC3Denum format;
         ResourceType type;
     };
     typedef HashMap<ResourceId, Resource> ResourceMap;
     struct Child {
         Child();
         ~Child();
 
         int pool;
@@ skipping 31 matching lines @@
     OwnPtr<TextureUploader> m_textureUploader;
     OwnPtr<AcceleratedTextureCopier> m_textureCopier;
     int m_maxTextureSize;
 
     DISALLOW_COPY_AND_ASSIGN(CCResourceProvider);
 };
 
 }
 
 #endif