| Index: content/browser/android/browser_surface_texture_manager.cc
|
| diff --git a/content/browser/android/browser_surface_texture_manager.cc b/content/browser/android/browser_surface_texture_manager.cc
|
| index 476ebf2ab027eb7eb755bf78355bc5869fb0347c..63178244a52aedf9ce08eb8179876f97eb4016df 100644
|
| --- a/content/browser/android/browser_surface_texture_manager.cc
|
| +++ b/content/browser/android/browser_surface_texture_manager.cc
|
| @@ -27,7 +27,7 @@ BrowserSurfaceTextureManager* BrowserSurfaceTextureManager::GetInstance() {
|
| void BrowserSurfaceTextureManager::RegisterSurfaceTexture(
|
| int surface_texture_id,
|
| int client_id,
|
| - gfx::SurfaceTexture* surface_texture) {
|
| + gl::SurfaceTexture* surface_texture) {
|
| content::CreateSurfaceTextureSurface(
|
| surface_texture_id, client_id, surface_texture);
|
| }
|
| @@ -41,10 +41,9 @@ void BrowserSurfaceTextureManager::UnregisterSurfaceTexture(
|
| gfx::AcceleratedWidget
|
| BrowserSurfaceTextureManager::AcquireNativeWidgetForSurfaceTexture(
|
| int surface_texture_id) {
|
| - gfx::ScopedJavaSurface surface(
|
| - content::GetSurfaceTextureSurface(
|
| - surface_texture_id,
|
| - BrowserGpuChannelHostFactory::instance()->GetGpuChannelId()));
|
| + gl::ScopedJavaSurface surface(content::GetSurfaceTextureSurface(
|
| + surface_texture_id,
|
| + BrowserGpuChannelHostFactory::instance()->GetGpuChannelId()));
|
| if (surface.j_surface().is_null())
|
| return NULL;
|
|
|
|
|