Use a public enum to pass in the map mode instead of an int. Fixes b/8633434

Change-Id: Ifbe7c7752effe3fe3e9ca722b9c5c611819fc5e6

3 files changed, 23 insertions, 22 deletions

diff --git a/chromium/plat_support/graphic_buffer_impl.cpp b/chromium/plat_support/graphic_buffer_impl.cpp
index 5ef76c7..4199557 100644
--- a/chromium/plat_support/graphic_buffer_impl.cpp
+++ b/chromium/plat_support/graphic_buffer_impl.cpp
@@ -51,15 +51,15 @@ void GraphicBufferImpl::Release(int buffer_id) {
 }
 
 // static
-int GraphicBufferImpl::LockStatic(int buffer_id, int mode, void** vaddr) {
+int GraphicBufferImpl::MapStatic(int buffer_id, AwMapMode mode, void** vaddr) {
   GraphicBufferImpl* buffer = reinterpret_cast<GraphicBufferImpl*>(buffer_id);
-  return buffer->Lock(mode, vaddr);
+  return buffer->Map(mode, vaddr);
 }
 
 // static
-int GraphicBufferImpl::UnlockStatic(int buffer_id) {
+int GraphicBufferImpl::UnmapStatic(int buffer_id) {
   GraphicBufferImpl* buffer = reinterpret_cast<GraphicBufferImpl*>(buffer_id);
-  return buffer->Unlock();
+  return buffer->Unmap();
 }
 
 // static
@@ -74,17 +74,16 @@ uint32_t GraphicBufferImpl::GetStrideStatic(int buffer_id) {
   return buffer->GetStride();
 }
 
-status_t GraphicBufferImpl::Lock(int mode, void** vaddr) {
+status_t GraphicBufferImpl::Map(AwMapMode mode, void** vaddr) {
   int usage = 0;
   switch (mode) {
-    // TODO(kaanb): Use public enum constants instead of integers.
-    case 0:
+    case MAP_READ_ONLY:
       usage = android::GraphicBuffer::USAGE_SW_READ_OFTEN;
       break;
-    case 1:
+    case MAP_WRITE_ONLY:
       usage = android::GraphicBuffer::USAGE_SW_WRITE_OFTEN;
       break;
-    case 2:
+    case MAP_READ_WRITE:
       usage = android::GraphicBuffer::USAGE_SW_READ_OFTEN |
           android::GraphicBuffer::USAGE_SW_WRITE_OFTEN;
       break;
@@ -94,7 +93,7 @@ status_t GraphicBufferImpl::Lock(int mode, void** vaddr) {
   return mBuffer->lock(usage, vaddr);
 }
 
-status_t GraphicBufferImpl::Unlock() {
+status_t GraphicBufferImpl::Unmap() {
   return mBuffer->unlock();
 }
 
diff --git a/chromium/plat_support/graphic_buffer_impl.h b/chromium/plat_support/graphic_buffer_impl.h
index 7db502f..13b806e 100644
--- a/chromium/plat_support/graphic_buffer_impl.h
+++ b/chromium/plat_support/graphic_buffer_impl.h
@@ -22,6 +22,8 @@
 
 #include <ui/GraphicBuffer.h>
 
+#include "android_webview/public/browser/draw_gl.h"
+
 namespace android {
 
 class GraphicBufferImpl {
@@ -30,14 +32,14 @@ class GraphicBufferImpl {
 
   static int Create(int w, int h);
   static void Release(int buffer_id);
-  static int LockStatic(int buffer_id, int mode, void** vaddr);
-  static int UnlockStatic(int buffer_id);
+  static int MapStatic(int buffer_id, AwMapMode mode, void** vaddr);
+  static int UnmapStatic(int buffer_id);
   static void* GetNativeBufferStatic(int buffer_id);
   static uint32_t GetStrideStatic(int buffer_id);
 
  private:
-  status_t Lock(int mode, void** vaddr);
-  status_t Unlock();
+  status_t Map(AwMapMode mode, void** vaddr);
+  status_t Unmap();
   status_t InitCheck() const;
   void* GetNativeBuffer() const;
   uint32_t GetStride() const;
@@ -46,6 +48,6 @@ class GraphicBufferImpl {
   sp<android::GraphicBuffer> mBuffer;
 };
 
-} // namespace android
+}  // namespace android
 
-#endif // ANDROID_GRAPHIC_BUFFER_IMPL_H
+#endif  // ANDROID_GRAPHIC_BUFFER_IMPL_H
diff --git a/chromium/plat_support/graphics_utils.cpp b/chromium/plat_support/graphics_utils.cpp
index 946c208..f0ef568 100644
--- a/chromium/plat_support/graphics_utils.cpp
+++ b/chromium/plat_support/graphics_utils.cpp
@@ -124,12 +124,12 @@ jint GetDrawSWFunctionTable(JNIEnv* env, jclass) {
 
 jint GetDrawGLFunctionTable(JNIEnv* env, jclass) {
   static const AwDrawGLFunctionTable function_table = {
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
+    &GraphicBufferImpl::Create,
+    &GraphicBufferImpl::Release,
+    &GraphicBufferImpl::MapStatic,
+    &GraphicBufferImpl::UnmapStatic,
+    &GraphicBufferImpl::GetNativeBufferStatic,
+    &GraphicBufferImpl::GetStrideStatic,
   };
   return reinterpret_cast<jint>(&function_table);
 }