Merge " Convert jint to jlong for native pointers in GLFunctionTable to support 64 b" into chromium-dev

4 files changed, 21 insertions, 21 deletions

diff --git a/chromium/java/com/android/webview/chromium/GraphicsUtils.java b/chromium/java/com/android/webview/chromium/GraphicsUtils.java
index a7671d1..66c3f75 100644
--- a/chromium/java/com/android/webview/chromium/GraphicsUtils.java
+++ b/chromium/java/com/android/webview/chromium/GraphicsUtils.java
@@ -17,15 +17,15 @@
 package com.android.webview.chromium;
 
 abstract class GraphicsUtils {
-    public static int getDrawSWFunctionTable() {
+    public static long getDrawSWFunctionTable() {
         return nativeGetDrawSWFunctionTable();
     }
 
-    public static int getDrawGLFunctionTable() {
+    public static long getDrawGLFunctionTable() {
         return nativeGetDrawGLFunctionTable();
     }
 
-    private static native int nativeGetDrawSWFunctionTable();
-    private static native int nativeGetDrawGLFunctionTable();
+    private static native long nativeGetDrawSWFunctionTable();
+    private static native long nativeGetDrawGLFunctionTable();
 
 }
diff --git a/chromium/plat_support/graphic_buffer_impl.cpp b/chromium/plat_support/graphic_buffer_impl.cpp
index bfa91a2..4426778 100644
--- a/chromium/plat_support/graphic_buffer_impl.cpp
+++ b/chromium/plat_support/graphic_buffer_impl.cpp
@@ -34,42 +34,42 @@ GraphicBufferImpl::~GraphicBufferImpl() {
 }
 
 // static
-int GraphicBufferImpl::Create(int w, int h) {
+long GraphicBufferImpl::Create(int w, int h) {
   GraphicBufferImpl* buffer = new GraphicBufferImpl(
       static_cast<uint32_t>(w), static_cast<uint32_t>(h));
   if (buffer->InitCheck() != NO_ERROR) {
     delete buffer;
     return 0;
   }
-  return reinterpret_cast<int>(buffer);
+  return reinterpret_cast<intptr_t>(buffer);
 }
 
 // static
-void GraphicBufferImpl::Release(int buffer_id) {
+void GraphicBufferImpl::Release(long buffer_id) {
   GraphicBufferImpl* buffer = reinterpret_cast<GraphicBufferImpl*>(buffer_id);
   delete buffer;
 }
 
 // static
-int GraphicBufferImpl::MapStatic(int buffer_id, AwMapMode mode, void** vaddr) {
+int GraphicBufferImpl::MapStatic(long buffer_id, AwMapMode mode, void** vaddr) {
   GraphicBufferImpl* buffer = reinterpret_cast<GraphicBufferImpl*>(buffer_id);
   return buffer->Map(mode, vaddr);
 }
 
 // static
-int GraphicBufferImpl::UnmapStatic(int buffer_id) {
+int GraphicBufferImpl::UnmapStatic(long buffer_id) {
   GraphicBufferImpl* buffer = reinterpret_cast<GraphicBufferImpl*>(buffer_id);
   return buffer->Unmap();
 }
 
 // static
-void* GraphicBufferImpl::GetNativeBufferStatic(int buffer_id) {
+void* GraphicBufferImpl::GetNativeBufferStatic(long buffer_id) {
   GraphicBufferImpl* buffer = reinterpret_cast<GraphicBufferImpl*>(buffer_id);
   return buffer->GetNativeBuffer();
 }
 
 // static
-uint32_t GraphicBufferImpl::GetStrideStatic(int buffer_id) {
+uint32_t GraphicBufferImpl::GetStrideStatic(long buffer_id) {
   GraphicBufferImpl* buffer = reinterpret_cast<GraphicBufferImpl*>(buffer_id);
   return buffer->GetStride();
 }
diff --git a/chromium/plat_support/graphic_buffer_impl.h b/chromium/plat_support/graphic_buffer_impl.h
index 13b806e..5d5da12 100644
--- a/chromium/plat_support/graphic_buffer_impl.h
+++ b/chromium/plat_support/graphic_buffer_impl.h
@@ -30,12 +30,12 @@ class GraphicBufferImpl {
  public:
   ~GraphicBufferImpl();
 
-  static int Create(int w, int h);
-  static void Release(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);
+  static long Create(int w, int h);
+  static void Release(long buffer_id);
+  static int MapStatic(long buffer_id, AwMapMode mode, void** vaddr);
+  static int UnmapStatic(long buffer_id);
+  static void* GetNativeBufferStatic(long buffer_id);
+  static uint32_t GetStrideStatic(long buffer_id);
 
  private:
   status_t Map(AwMapMode mode, void** vaddr);
diff --git a/chromium/plat_support/graphics_utils.cpp b/chromium/plat_support/graphics_utils.cpp
index 47ae097..93b1b39 100644
--- a/chromium/plat_support/graphics_utils.cpp
+++ b/chromium/plat_support/graphics_utils.cpp
@@ -82,15 +82,15 @@ void ReleasePixels(AwPixelInfo* pixels) {
   delete static_cast<PixelInfo*>(pixels);
 }
 
-jint GetDrawSWFunctionTable(JNIEnv* env, jclass) {
+jlong GetDrawSWFunctionTable(JNIEnv* env, jclass) {
   static const AwDrawSWFunctionTable function_table = {
       &GetPixels,
       &ReleasePixels,
   };
-  return reinterpret_cast<jint>(&function_table);
+  return reinterpret_cast<intptr_t>(&function_table);
 }
 
-jint GetDrawGLFunctionTable(JNIEnv* env, jclass) {
+jlong GetDrawGLFunctionTable(JNIEnv* env, jclass) {
   static const AwDrawGLFunctionTable function_table = {
     &GraphicBufferImpl::Create,
     &GraphicBufferImpl::Release,
@@ -99,7 +99,7 @@ jint GetDrawGLFunctionTable(JNIEnv* env, jclass) {
     &GraphicBufferImpl::GetNativeBufferStatic,
     &GraphicBufferImpl::GetStrideStatic,
   };
-  return reinterpret_cast<jint>(&function_table);
+  return reinterpret_cast<intptr_t>(&function_table);
 }
 
 const char kClassName[] = "com/android/webview/chromium/GraphicsUtils";