diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
| commit | eb525c5499e34cc9c4b825d6d9e75bb07cc06ace (patch) | |
| tree | d908ce4bfe1717d2cd53f41327d8b9ba8304355f /content/common/gpu/gpu_channel.h | |
| parent | 3c54152607de4272b3da0c146b71dcba8a0e5610 (diff) | |
| download | chromium_org-eb525c5499e34cc9c4b825d6d9e75bb07cc06ace.tar.gz | |
Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
Diffstat (limited to 'content/common/gpu/gpu_channel.h')
| -rw-r--r-- | content/common/gpu/gpu_channel.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/common/gpu/gpu_channel.h b/content/common/gpu/gpu_channel.h index 7fdae98a03..ba017054d4 100644 --- a/content/common/gpu/gpu_channel.h +++ b/content/common/gpu/gpu_channel.h @@ -176,13 +176,15 @@ class GpuChannel : public IPC::Listener, #if defined(OS_ANDROID) // Register the StreamTextureProxy class with the gpu process so that all // the callbacks will be correctly forwarded to the renderer. - void OnRegisterStreamTextureProxy( - int32 stream_id, const gfx::Size& initial_size, int32* route_id); + void OnRegisterStreamTextureProxy(int32 stream_id, int32* route_id); // Create a java surface texture object and send it to the renderer process // through binder thread. void OnEstablishStreamTexture( int32 stream_id, int32 primary_id, int32 secondary_id); + + // Set the size of StreamTexture. + void OnSetStreamTextureSize(int32 stream_id, const gfx::Size& size); #endif // Collect rendering stats. |