Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / android_webview / browser / gpu_memory_buffer_factory_impl.cc

diff --git a/src/android_webview/browser/gpu_memory_buffer_factory_impl.cc b/src/android_webview/browser/gpu_memory_buffer_factory_impl.cc
index 4e2f5d7..8be58c5 100644 (file)
--- a/src/android_webview/browser/gpu_memory_buffer_factory_impl.cc
+++ b/src/android_webview/browser/gpu_memory_buffer_factory_impl.cc
@@ -31,25 +31,12 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
   }
 
   // Overridden from gfx::GpuMemoryBuffer:
-  virtual void Map(gfx::GpuMemoryBuffer::AccessMode mode,
-                   void** vaddr) OVERRIDE {
-    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);
+  virtual void* Map() OVERRIDE {
+    void* vaddr = NULL;
+    int err = g_gl_draw_functions->map(buffer_id_, MAP_READ_WRITE, &vaddr);
     DCHECK(!err);
     mapped_ = true;
+    return vaddr;
   }
   virtual void Unmap() OVERRIDE {
     int err = g_gl_draw_functions->unmap(buffer_id_);
@@ -86,7 +73,8 @@ GpuMemoryBufferFactoryImpl::~GpuMemoryBufferFactoryImpl() {
 gfx::GpuMemoryBuffer* GpuMemoryBufferFactoryImpl::CreateGpuMemoryBuffer(
     size_t width,
     size_t height,
-    unsigned internalformat) {
+    unsigned internalformat,
+    unsigned usage) {
   // For Android WebView we assume the |internalformat| will always be
   // GL_RGBA8_OES.
   CHECK_EQ(static_cast<GLenum>(GL_RGBA8_OES), internalformat);