| 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 358f480e0ee8d52e69bf27850d1ffcc50c3070b2..106fc7aa54a2cebb250358c1b53e51f159c0e1ca 100644
|
| --- a/gpu/ipc/client/android/in_process_surface_texture_manager.h
|
| +++ b/gpu/ipc/client/android/in_process_surface_texture_manager.h
|
| @@ -24,7 +24,7 @@ class GPU_EXPORT InProcessSurfaceTextureManager : public SurfaceTextureManager {
|
| // Overridden from SurfaceTextureManager:
|
| void RegisterSurfaceTexture(int surface_texture_id,
|
| int client_id,
|
| - gfx::SurfaceTexture* surface_texture) override;
|
| + gl::SurfaceTexture* surface_texture) override;
|
| void UnregisterSurfaceTexture(int surface_texture_id, int client_id) override;
|
| gfx::AcceleratedWidget AcquireNativeWidgetForSurfaceTexture(
|
| int surface_texture_id) override;
|
| @@ -36,7 +36,7 @@ class GPU_EXPORT InProcessSurfaceTextureManager : public SurfaceTextureManager {
|
| ~InProcessSurfaceTextureManager() override;
|
|
|
| using SurfaceTextureMap =
|
| - base::ScopedPtrHashMap<int, std::unique_ptr<gfx::ScopedJavaSurface>>;
|
| + base::ScopedPtrHashMap<int, std::unique_ptr<gl::ScopedJavaSurface>>;
|
| SurfaceTextureMap surface_textures_;
|
| base::Lock lock_;
|
|
|
|
|