Plumb GpuMemoryBuffer allocation to GPU process.

content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/client/gpu_memory_buffer_impl_surface_texture.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "content/common/android/surface_texture_lookup.h"
 #include "ui/gl/gl_bindings.h"
@@ skipping 52 matching lines @@
 }
 
 bool GpuMemoryBufferImplSurfaceTexture::InitializeFromHandle(
     gfx::GpuMemoryBufferHandle handle) {
   TRACE_EVENT0("gpu",
                "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;
 
   ANativeWindow_setBuffersGeometry(native_window_,
                                    size_.width(),
                                    size_.height(),
                                    WindowFormat(internalformat_));
 
-  surface_texture_id_ = handle.surface_texture_id;
+  gpu_memory_id_ = handle.gpu_memory_id;
   return true;
 }
 
 void* GpuMemoryBufferImplSurfaceTexture::Map() {
   TRACE_EVENT0("gpu", "GpuMemoryBufferImplSurfaceTexture::Map");
 
   DCHECK(!mapped_);
   DCHECK(native_window_);
   ANativeWindow_Buffer buffer;
   int status = ANativeWindow_lock(native_window_, &buffer, NULL);
@@ skipping 15 matching lines @@
   ANativeWindow_unlockAndPost(native_window_);
   mapped_ = false;
 }
 
 uint32 GpuMemoryBufferImplSurfaceTexture::GetStride() const { return stride_; }
 
 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;
 }
 
 }  // namespace content