commit 2846d3c1b3bb2cc2f7ac1600df7b16a665c2c93e
author Torne (Richard Coles) <torne@google.com> Tue Aug 12 14:03:44 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 11 18:49:43 2014 +0000
tree 3232f7e64656af8b6e6d9808633873ba38bbb0e5
parent 6ed700e171cb2ee3303c08a1db2abc0e56fd307a
parent a06a5d8a7e07adebd06e165d3e4b7e82707f5b78

Merge "Merge up to 707d93c from chromium-dev."

chromium/plat_support/graphics_utils.cpp

diff --git a/chromium/plat_support/graphics_utils.cpp b/chromium/plat_support/graphics_utils.cpp
index cbd82e9..66acf50 100644
--- a/chromium/plat_support/graphics_utils.cpp
+++ b/chromium/plat_support/graphics_utils.cpp
@@ -82,22 +82,20 @@
 }
 
 jlong GetDrawSWFunctionTable(JNIEnv* env, jclass) {
-  static const AwDrawSWFunctionTable function_table = {
-      &GetPixels,
-      &ReleasePixels,
-  };
+  static AwDrawSWFunctionTable function_table;
+  function_table.access_pixels = &GetPixels;
+  function_table.release_pixels = &ReleasePixels;
   return reinterpret_cast<intptr_t>(&function_table);
 }
 
 jlong GetDrawGLFunctionTable(JNIEnv* env, jclass) {
-  static const AwDrawGLFunctionTable function_table = {
-    &GraphicBufferImpl::Create,
-    &GraphicBufferImpl::Release,
-    &GraphicBufferImpl::MapStatic,
-    &GraphicBufferImpl::UnmapStatic,
-    &GraphicBufferImpl::GetNativeBufferStatic,
-    &GraphicBufferImpl::GetStrideStatic,
-  };
+  static AwDrawGLFunctionTable function_table;
+  function_table.create_graphic_buffer = &GraphicBufferImpl::Create;
+  function_table.release_graphic_buffer = &GraphicBufferImpl::Release;
+  function_table.map = &GraphicBufferImpl::MapStatic;
+  function_table.unmap = &GraphicBufferImpl::UnmapStatic;
+  function_table.get_native_buffer = &GraphicBufferImpl::GetNativeBufferStatic;
+  function_table.get_stride = &GraphicBufferImpl::GetStrideStatic;
   return reinterpret_cast<intptr_t>(&function_table);
 }