diff --git a/core/jni/android/graphics/Canvas.cpp b/core/jni/android/graphics/Canvas.cpp index 89490bc94c711..11089da274ae6 100644 --- a/core/jni/android/graphics/Canvas.cpp +++ b/core/jni/android/graphics/Canvas.cpp @@ -321,9 +321,10 @@ public: } static jboolean clipPath(JNIEnv* env, jobject, jlong canvasHandle, - SkPath* path, jint op) { + jlong pathHandle, jint op) { SkCanvas* canvas = reinterpret_cast(canvasHandle); - bool result = canvas->clipPath(*path, static_cast(op)); + bool result = canvas->clipPath(*reinterpret_cast(pathHandle), + static_cast(op)); return result ? JNI_TRUE : JNI_FALSE; } @@ -336,9 +337,9 @@ public: } static void setDrawFilter(JNIEnv* env, jobject, jlong canvasHandle, - SkDrawFilter* filter) { + jlong filterHandle) { SkCanvas* canvas = reinterpret_cast(canvasHandle); - canvas->setDrawFilter(filter); + canvas->setDrawFilter(reinterpret_cast(filterHandle)); } static jboolean quickReject__RectF(JNIEnv* env, jobject, jlong canvasHandle, @@ -350,9 +351,9 @@ public: } static jboolean quickReject__Path(JNIEnv* env, jobject, jlong canvasHandle, - SkPath* path) { + jlong pathHandle) { SkCanvas* canvas = reinterpret_cast(canvasHandle); - bool result = canvas->quickReject(*path); + bool result = canvas->quickReject(*reinterpret_cast(pathHandle)); return result ? JNI_TRUE : JNI_FALSE; } diff --git a/core/jni/android_view_GLES20Canvas.cpp b/core/jni/android_view_GLES20Canvas.cpp index 86d5099f2f8c3..591ff77b2c943 100644 --- a/core/jni/android_view_GLES20Canvas.cpp +++ b/core/jni/android_view_GLES20Canvas.cpp @@ -214,9 +214,9 @@ static jint android_view_GLES20Canvas_callDrawGLFunction(JNIEnv* env, jobject cl } static void android_view_GLES20Canvas_detachFunctor(JNIEnv* env, - jobject clazz, jlong rendererHandle, jlong functorHandle) { - OpenGLRenderer* renderer = reinterpret_cast(rendererHandle); - Functor* functor = reinterpret_cast(functorHandle); + jobject clazz, jlong rendererPtr, jlong functorPtr) { + OpenGLRenderer* renderer = reinterpret_cast(rendererPtr); + Functor* functor = reinterpret_cast(functorPtr); renderer->detachFunctor(functor); }