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 25b51b6acd975cf5ef893c1fdaccf71e992a84ba..2a33ccf9e9576a42f77da81e39bb6984cc909c9d 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 |
@@ -11,6 +11,18 @@ |
namespace content { |
+GpuMemoryBufferImplSurfaceTexture::GpuMemoryBufferImplSurfaceTexture( |
+ const gfx::Size& size, |
+ unsigned internalformat) |
+ : GpuMemoryBufferImpl(size, internalformat), |
+ native_window_(NULL), |
+ stride_(0u) {} |
+ |
+GpuMemoryBufferImplSurfaceTexture::~GpuMemoryBufferImplSurfaceTexture() { |
+ if (native_window_) |
+ ANativeWindow_release(native_window_); |
+} |
+ |
// static |
bool GpuMemoryBufferImplSurfaceTexture::IsFormatSupported( |
unsigned internalformat) { |
@@ -33,21 +45,10 @@ int GpuMemoryBufferImplSurfaceTexture::WindowFormat(unsigned internalformat) { |
} |
} |
-GpuMemoryBufferImplSurfaceTexture::GpuMemoryBufferImplSurfaceTexture( |
- gfx::Size size, |
- unsigned internalformat) |
- : GpuMemoryBufferImpl(size, internalformat), |
- native_window_(NULL), |
- stride_(0u) {} |
- |
-GpuMemoryBufferImplSurfaceTexture::~GpuMemoryBufferImplSurfaceTexture() { |
- if (native_window_) |
- ANativeWindow_release(native_window_); |
-} |
- |
-bool GpuMemoryBufferImplSurfaceTexture::Initialize( |
+bool GpuMemoryBufferImplSurfaceTexture::InitializeFromHandle( |
gfx::GpuMemoryBufferHandle handle) { |
- TRACE_EVENT0("gpu", "GpuMemoryBufferImplSurfaceTexture::Initialize"); |
+ TRACE_EVENT0("gpu", |
+ "GpuMemoryBufferImplSurfaceTexture::InitializeFromHandle"); |
DCHECK(!native_window_); |
native_window_ = SurfaceTextureLookup::GetInstance()->AcquireNativeWidget( |