summaryrefslogtreecommitdiffstats
path: root/content/renderer/pepper/pepper_compositor_host.h
diff options
context:
space:
mode:
authorpenghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-20 17:00:46 +0000
committerpenghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-20 17:00:46 +0000
commit83649fbe67e5f083e9bbfa5276e85c3cd1817a3f (patch)
tree1346d656858ac0a6fe44093301d6a6514f1f1a32 /content/renderer/pepper/pepper_compositor_host.h
parentaaf6cce59e126b77ad17f2e8452c83ae56e0111f (diff)
downloadchromium_src-83649fbe67e5f083e9bbfa5276e85c3cd1817a3f.zip
chromium_src-83649fbe67e5f083e9bbfa5276e85c3cd1817a3f.tar.gz
chromium_src-83649fbe67e5f083e9bbfa5276e85c3cd1817a3f.tar.bz2
[PPAPI] Add browser tests for compositor API
And fix a bug found with the tests. BindGraphics() does not work for a device which is in the same type with the current bound device. BUG=374383 R=piman@chromium.org, raymes@chromium.org Review URL: https://codereview.chromium.org/324983005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278728 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/pepper/pepper_compositor_host.h')
-rw-r--r--content/renderer/pepper/pepper_compositor_host.h15
1 files changed, 8 insertions, 7 deletions
diff --git a/content/renderer/pepper/pepper_compositor_host.h b/content/renderer/pepper/pepper_compositor_host.h
index 6d5a3ef..de2f72b 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(