| Index: gpu/ipc/client/android/in_process_surface_texture_manager.h
|
| diff --git a/gpu/ipc/client/android/in_process_surface_texture_manager.h b/gpu/ipc/client/android/in_process_surface_texture_manager.h
|
| index 106fc7aa54a2cebb250358c1b53e51f159c0e1ca..cf3ee6de98ca781bf7cefd606a02214ac9ed6918 100644
|
| --- a/gpu/ipc/client/android/in_process_surface_texture_manager.h
|
| +++ b/gpu/ipc/client/android/in_process_surface_texture_manager.h
|
| @@ -28,6 +28,12 @@ class GPU_EXPORT InProcessSurfaceTextureManager : public SurfaceTextureManager {
|
| void UnregisterSurfaceTexture(int surface_texture_id, int client_id) override;
|
| gfx::AcceleratedWidget AcquireNativeWidgetForSurfaceTexture(
|
| int surface_texture_id) override;
|
| + void RegisterBrowserSurfaceTexture(
|
| + int surface_texture_id,
|
| + gl::SurfaceTexture* surface_texture) override;
|
| + void UnregisterBrowserSurfaceTexture(int surface_texture_id) override;
|
| + gl::ScopedJavaSurface GetBrowserSurfaceTexture(
|
| + int surface_texture_id) override;
|
|
|
| private:
|
| friend struct base::DefaultSingletonTraits<InProcessSurfaceTextureManager>;
|
| @@ -38,6 +44,9 @@ class GPU_EXPORT InProcessSurfaceTextureManager : public SurfaceTextureManager {
|
| using SurfaceTextureMap =
|
| base::ScopedPtrHashMap<int, std::unique_ptr<gl::ScopedJavaSurface>>;
|
| SurfaceTextureMap surface_textures_;
|
| +
|
| + // TODO(tguilbert): Use the same unorderer map if possible.
|
| + std::unordered_map<int, gl::ScopedJavaSurface> browser_surface_textures_;
|
| base::Lock lock_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(InProcessSurfaceTextureManager);
|
|
|