Change glimage to accept a type.

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 18 matching lines @@
       return WINDOW_FORMAT_RGBA_8888;
     default:
       NOTREACHED();
       return 0;
   }
 }
 
 GpuMemoryBufferImplSurfaceTexture::GpuMemoryBufferImplSurfaceTexture(
     gfx::Size size,
     unsigned internalformat)
-    : GpuMemoryBufferImpl(size, internalformat),
+    : GpuMemoryBufferImpl(size,
+                          internalformat,
+                          gfx::GpuMemoryBuffer::READ_WRITE),
       native_window_(NULL),
-      stride_(0u) {}
+      stride_(0u) {
+}
 
 GpuMemoryBufferImplSurfaceTexture::~GpuMemoryBufferImplSurfaceTexture() {
   if (native_window_)
     ANativeWindow_release(native_window_);
 }
 
 bool GpuMemoryBufferImplSurfaceTexture::Initialize(
     gfx::GpuMemoryBufferHandle handle) {
   TRACE_EVENT0("gpu", "GpuMemoryBufferImplSurfaceTexture::Initialize");
 
   DCHECK(!native_window_);
   native_window_ = SurfaceTextureLookup::GetInstance()->AcquireNativeWidget(
       handle.surface_texture_id.primary_id,
       handle.surface_texture_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;
   return true;
 }
 
-void* GpuMemoryBufferImplSurfaceTexture::Map(AccessMode mode) {
+void* GpuMemoryBufferImplSurfaceTexture::Map() {
   TRACE_EVENT0("gpu", "GpuMemoryBufferImplSurfaceTexture::Map");
 
   DCHECK(!mapped_);
   DCHECK(native_window_);
   ANativeWindow_Buffer buffer;
   int status = ANativeWindow_lock(native_window_, &buffer, NULL);
   if (status) {
     VLOG(1) << "ANativeWindow_lock failed with error code: " << status;
     return NULL;
   }
@@ skipping 16 matching lines @@
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplSurfaceTexture::GetHandle()
     const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::SURFACE_TEXTURE_BUFFER;
   handle.surface_texture_id = surface_texture_id_;
   return handle;
 }
 
 }  // namespace content