From b8963e42e485a82726076dbfd100023e2cdcdea8 Mon Sep 17 00:00:00 2001 From: "rmcilroy@chromium.org" Date: Mon, 24 Mar 2014 22:17:37 +0000 Subject: [Webview]: Convert jint to jlong for native pointers in GLFunctionTable to support 64 bit. Also roll AOSP to include https://android-review.googlesource.com/#/c/88746/ BUG=354405 Review URL: https://codereview.chromium.org/210023002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@259034 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/public/browser/draw_gl.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'android_webview/public') diff --git a/android_webview/public/browser/draw_gl.h b/android_webview/public/browser/draw_gl.h index b2a554d..56e3064 100644 --- a/android_webview/public/browser/draw_gl.h +++ b/android_webview/public/browser/draw_gl.h @@ -68,17 +68,17 @@ enum AwMapMode { }; // Called to create a GraphicBuffer -typedef int AwCreateGraphicBufferFunction(int w, int h); +typedef long AwCreateGraphicBufferFunction(int w, int h); // Called to release a GraphicBuffer -typedef void AwReleaseGraphicBufferFunction(int buffer_id); +typedef void AwReleaseGraphicBufferFunction(long buffer_id); // Called to map a GraphicBuffer in |mode|. -typedef int AwMapFunction(int buffer_id, AwMapMode mode, void** vaddr); +typedef int AwMapFunction(long buffer_id, AwMapMode mode, void** vaddr); // Called to unmap a GraphicBuffer -typedef int AwUnmapFunction(int buffer_id); +typedef int AwUnmapFunction(long buffer_id); // Called to get a native buffer pointer -typedef void* AwGetNativeBufferFunction(int buffer_id); +typedef void* AwGetNativeBufferFunction(long buffer_id); // Called to get the stride of the buffer -typedef unsigned int AwGetStrideFunction(int buffer_id); +typedef unsigned int AwGetStrideFunction(long buffer_id); // Set of functions used in rendering in hardware mode struct AwDrawGLFunctionTable { -- cgit v1.1