| Index: cc/CCResourceProvider.h
|
| diff --git a/cc/CCResourceProvider.h b/cc/CCResourceProvider.h
|
| index e90c1f2e9640f4d17e6158e364bc544eebc45ada..0bea057a49720df421856745fc9d0c201f5b579f 100644
|
| --- a/cc/CCResourceProvider.h
|
| +++ b/cc/CCResourceProvider.h
|
| @@ -28,8 +28,11 @@ 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).
|
| @@ -43,28 +46,11 @@ public:
|
| 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(); }
|
| @@ -118,16 +104,16 @@ public:
|
|
|
| // 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
|
| @@ -223,7 +209,7 @@ private:
|
| bool lockedForWrite;
|
| bool external;
|
| bool exported;
|
| - bool markedForDeletion;
|
| + bool deleted;
|
| IntSize size;
|
| GC3Denum format;
|
| ResourceType type;
|
|
|