| Index: cc/layers/texture_layer_client.h
|
| diff --git a/cc/layers/texture_layer_client.h b/cc/layers/texture_layer_client.h
|
| index f0a9ee0c507c3e45f683dcfb3685bfe86b059800..39f1e80d4cb6997db6445379e205090b71b2c56b 100644
|
| --- a/cc/layers/texture_layer_client.h
|
| +++ b/cc/layers/texture_layer_client.h
|
| @@ -5,27 +5,26 @@
|
| #ifndef CC_LAYERS_TEXTURE_LAYER_CLIENT_H_
|
| #define CC_LAYERS_TEXTURE_LAYER_CLIENT_H_
|
|
|
| -namespace WebKit {
|
| -class WebGraphicsContext3D;
|
| -}
|
| +namespace WebKit { class WebGraphicsContext3D; }
|
|
|
| namespace cc {
|
| class ResourceUpdateQueue;
|
|
|
| class TextureLayerClient {
|
| -public:
|
| - // Called to prepare this layer's texture for compositing. The client may queue a texture
|
| - // upload or copy on the ResourceUpdateQueue.
|
| - // Returns the texture ID to be used for compositing.
|
| - virtual unsigned prepareTexture(ResourceUpdateQueue&) = 0;
|
| -
|
| - // Returns the context that is providing the texture. Used for rate limiting and detecting lost context.
|
| - virtual WebKit::WebGraphicsContext3D* context() = 0;
|
| -
|
| -protected:
|
| - virtual ~TextureLayerClient() { }
|
| + public:
|
| + // Called to prepare this layer's texture for compositing. The client may
|
| + // queue a texture upload or copy on the ResourceUpdateQueue.
|
| + // Returns the texture ID to be used for compositing.
|
| + virtual unsigned PrepareTexture(ResourceUpdateQueue* queue) = 0;
|
| +
|
| + // Returns the context that is providing the texture. Used for rate limiting
|
| + // and detecting lost context.
|
| + virtual WebKit::WebGraphicsContext3D* Context3d() = 0;
|
| +
|
| + protected:
|
| + virtual ~TextureLayerClient() {}
|
| };
|
|
|
| -}
|
| +} // namespace cc
|
|
|
| #endif // CC_LAYERS_TEXTURE_LAYER_CLIENT_H_
|
|
|