Change lock/unlock to map/unmap in DrawGL methods. It also changes the API to take the map mode as a public enum rather than an int.

BUG=175012

Review URL: https://chromiumcodereview.appspot.com/15268007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@201227 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 27 insertions, 9 deletions

diff --git a/android_webview/browser/gpu_memory_buffer_impl.cc b/android_webview/browser/gpu_memory_buffer_impl.cc
index c22fae8..3cc103b 100644
--- a/android_webview/browser/gpu_memory_buffer_impl.cc
+++ b/android_webview/browser/gpu_memory_buffer_impl.cc
@@ -33,14 +33,28 @@ GpuMemoryBufferImpl::~GpuMemoryBufferImpl() {
 void GpuMemoryBufferImpl::Map(gpu::GpuMemoryBuffer::AccessMode mode,
     void** vaddr) {
   DCHECK(buffer_id_ != 0);
-  int err = g_gl_draw_functions->lock(buffer_id_, mode, vaddr);
+  AwMapMode map_mode = MAP_READ_ONLY;
+  switch (mode) {
+    case GpuMemoryBuffer::READ_ONLY:
+      map_mode = MAP_READ_ONLY;
+      break;
+    case GpuMemoryBuffer::WRITE_ONLY:
+      map_mode = MAP_WRITE_ONLY;
+      break;
+    case GpuMemoryBuffer::READ_WRITE:
+      map_mode = MAP_READ_WRITE;
+      break;
+    default:
+      LOG(DFATAL) << "Unknown map mode: " << mode;
+  }
+  int err = g_gl_draw_functions->map(buffer_id_, map_mode, vaddr);
   DCHECK(err == 0);
   mapped_ = true;
 }
 
 void GpuMemoryBufferImpl::Unmap() {
   DCHECK(buffer_id_ != 0);
-  int err = g_gl_draw_functions->unlock(buffer_id_);
+  int err = g_gl_draw_functions->unmap(buffer_id_);
   DCHECK(err == 0);
   mapped_ = false;
 }
diff --git a/android_webview/public/browser/draw_gl.h b/android_webview/public/browser/draw_gl.h
index 1d124c8..e3108d5 100644
--- a/android_webview/public/browser/draw_gl.h
+++ b/android_webview/public/browser/draw_gl.h
@@ -77,16 +77,20 @@ struct AwDrawGLInfo {
 typedef void (AwDrawGLFunction)(int view_context,
                                 AwDrawGLInfo* draw_info,
                                 void* spare);
+enum AwMapMode {
+  MAP_READ_ONLY,
+  MAP_WRITE_ONLY,
+  MAP_READ_WRITE,
+};
 
 // Called to create a GraphicBuffer
 typedef int AwCreateGraphicBufferFunction(int w, int h);
 // Called to release a GraphicBuffer
 typedef void AwReleaseGraphicBufferFunction(int buffer_id);
-// Called to lock a GraphicBuffer in |mode|, which is
-// defined in AccessMode enum in gpu/command_buffer/client/gpu_memory_buffer.h
-typedef int AwLockFunction(int buffer_id, int mode, void** vaddr);
-// Called to unlock a GraphicBuffer
-typedef int AwUnlockFunction(int buffer_id);
+// Called to map a GraphicBuffer in |mode|.
+typedef int AwMapFunction(int buffer_id, AwMapMode mode, void** vaddr);
+// Called to unmap a GraphicBuffer
+typedef int AwUnmapFunction(int buffer_id);
 // Called to get a native buffer pointer
 typedef void* AwGetNativeBufferFunction(int buffer_id);
 // Called to get the stride of the buffer
@@ -96,8 +100,8 @@ typedef unsigned int AwGetStrideFunction(int buffer_id);
 struct AwDrawGLFunctionTable {
   AwCreateGraphicBufferFunction* create_graphic_buffer;
   AwReleaseGraphicBufferFunction* release_graphic_buffer;
-  AwLockFunction* lock;
-  AwUnlockFunction* unlock;
+  AwMapFunction* map;
+  AwUnmapFunction* unmap;
   AwGetNativeBufferFunction* get_native_buffer;
   AwGetStrideFunction* get_stride;
 };