commit d228a03891f60520d517b2a3bc900b008b2da702
author Narayan Kamath <narayan@google.com> Wed Jan 29 15:02:05 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 29 15:02:05 2014 +0000
tree 3dfd7ab4f6fe1fbe427bcf31561a7cc705824143
parent d4ccffd3ba7f7c27ddfc56231cf7f2424842b1e3
parent e3a6663bb2d006c3e8cea7c529378af862f050a6

Merge "mNativeCanvas is long, not int."

core/jni/android_view_TextureView.cpp

diff --git a/core/jni/android_view_TextureView.cpp b/core/jni/android_view_TextureView.cpp
index b7eca8d..54f9278 100644
--- a/core/jni/android_view_TextureView.cpp
+++ b/core/jni/android_view_TextureView.cpp
@@ -127,7 +127,7 @@
 static inline void swapCanvasPtr(JNIEnv* env, jobject canvasObj, SkCanvas* newCanvas) {
     jobject canvasFinalizerObj = env->GetObjectField(canvasObj, gCanvasClassInfo.mFinalizer);
     SkCanvas* previousCanvas = reinterpret_cast<SkCanvas*>(
-          env->GetIntField(canvasObj, gCanvasClassInfo.mNativeCanvas));
+          env->GetLongField(canvasObj, gCanvasClassInfo.mNativeCanvas));
     env->SetLongField(canvasObj, gCanvasClassInfo.mNativeCanvas, (jlong)newCanvas);
     env->SetLongField(canvasFinalizerObj, gCanvasFinalizerClassInfo.mNativeCanvas, (jlong)newCanvas);
     SkSafeUnref(previousCanvas);