am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."

* commit 'dfd4f5232c87c51fe639b594fd210b4073eca42b':
  mNativeCanvas is long, not int.
This commit is contained in:
Narayan Kamath
2014-01-29 15:29:23 +00:00
committed by Android Git Automerger

View File

@@ -127,7 +127,7 @@ static void android_view_TextureView_destroyNativeWindow(JNIEnv* env, jobject te
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);