| Index: content/renderer/pepper/pepper_compositor_host.h
|
| diff --git a/content/renderer/pepper/pepper_compositor_host.h b/content/renderer/pepper/pepper_compositor_host.h
|
| index 6d5a3efaf8335a232135d9b9b17d3a1dc9d37884..f41f9dbaad5c74afc4fad1f3279c921e0ba98a59 100644
|
| --- a/content/renderer/pepper/pepper_compositor_host.h
|
| +++ b/content/renderer/pepper/pepper_compositor_host.h
|
| @@ -44,17 +44,18 @@ class PepperCompositorHost : public ppapi::host::ResourceHost {
|
| private:
|
| virtual ~PepperCompositorHost();
|
|
|
| - void UpdateLayer(const scoped_refptr<cc::Layer>& layer,
|
| - const ppapi::CompositorLayerData* old_layer,
|
| - const ppapi::CompositorLayerData* new_layer,
|
| - scoped_ptr<base::SharedMemory> image_shm);
|
| - void ResourceReleased(int32_t id,
|
| - uint32_t sync_point,
|
| - bool is_lost);
|
| void ImageReleased(int32_t id,
|
| const scoped_ptr<base::SharedMemory>& shared_memory,
|
| uint32_t sync_point,
|
| bool is_lost);
|
| + void ResourceReleased(int32_t id,
|
| + uint32_t sync_point,
|
| + bool is_lost);
|
| + void SendCommitLayersReplyIfNecessary();
|
| + void UpdateLayer(const scoped_refptr<cc::Layer>& layer,
|
| + const ppapi::CompositorLayerData* old_layer,
|
| + const ppapi::CompositorLayerData* new_layer,
|
| + scoped_ptr<base::SharedMemory> image_shm);
|
|
|
| // ResourceMessageHandler overrides:
|
| virtual int32_t OnResourceMessageReceived(
|
| @@ -69,6 +70,7 @@ class PepperCompositorHost : public ppapi::host::ResourceHost {
|
| ppapi::host::HostMessageContext* context,
|
| const std::vector<ppapi::CompositorLayerData>& layers,
|
| bool reset);
|
| + int32_t OnHostMsgRelease(ppapi::host::HostMessageContext* context);
|
|
|
| // Non-owning pointer to the plugin instance this context is currently bound
|
| // to, if any. If the context is currently unbound, this will be NULL.
|
|
|