| Index: content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
|
| diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
|
| index f6080506caadab0bfbdbb6aba88c7ee5a1289ec9..3e24efb05454682ddb14f298f213e0959468f739 100644
|
| --- a/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
|
| +++ b/content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc
|
| @@ -70,8 +70,7 @@ bool GpuMemoryBufferImplSurfaceTexture::InitializeFromHandle(
|
| DCHECK(IsFormatSupported(internalformat_));
|
| DCHECK(!native_window_);
|
| native_window_ = SurfaceTextureLookup::GetInstance()->AcquireNativeWidget(
|
| - handle.surface_texture_id.primary_id,
|
| - handle.surface_texture_id.secondary_id);
|
| + handle.gpu_memory_id.primary_id, handle.gpu_memory_id.secondary_id);
|
| if (!native_window_)
|
| return false;
|
|
|
| @@ -80,7 +79,7 @@ bool GpuMemoryBufferImplSurfaceTexture::InitializeFromHandle(
|
| size_.height(),
|
| WindowFormat(internalformat_));
|
|
|
| - surface_texture_id_ = handle.surface_texture_id;
|
| + gpu_memory_id_ = handle.gpu_memory_id;
|
| return true;
|
| }
|
|
|
| @@ -116,7 +115,7 @@ gfx::GpuMemoryBufferHandle GpuMemoryBufferImplSurfaceTexture::GetHandle()
|
| const {
|
| gfx::GpuMemoryBufferHandle handle;
|
| handle.type = gfx::SURFACE_TEXTURE_BUFFER;
|
| - handle.surface_texture_id = surface_texture_id_;
|
| + handle.gpu_memory_id = gpu_memory_id_;
|
| return handle;
|
| }
|
|
|
|
|