diff options
| author | Chris Craik <ccraik@google.com> | 2012-04-20 16:44:31 -0700 |
|---|---|---|
| committer | Chris Craik <ccraik@google.com> | 2012-04-23 11:12:56 -0700 |
| commit | 24b412c6f16018a2a2971eef09648ce105ef618a (patch) | |
| tree | 8db18a10a636dbab948d70c65e37542bad55c71e /Source/WebKit/android/nav | |
| parent | 492bcfac9fc25b61f44811050fb0cfe827eb6a08 (diff) | |
| download | external_webkit-24b412c6f16018a2a2971eef09648ce105ef618a.zip external_webkit-24b412c6f16018a2a2971eef09648ce105ef618a.tar.gz external_webkit-24b412c6f16018a2a2971eef09648ce105ef618a.tar.bz2 | |
signal framework to unregister functor
Change-Id: Ia503e508a13c40c29f18db924dce4ac711b03c68
Diffstat (limited to 'Source/WebKit/android/nav')
| -rw-r--r-- | Source/WebKit/android/nav/WebView.cpp | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/Source/WebKit/android/nav/WebView.cpp b/Source/WebKit/android/nav/WebView.cpp index fbd0d94..c6d5679 100644 --- a/Source/WebKit/android/nav/WebView.cpp +++ b/Source/WebKit/android/nav/WebView.cpp @@ -811,7 +811,7 @@ static jint nativeDraw(JNIEnv *env, jobject obj, jobject canv, return reinterpret_cast<jint>(pictureSet); } -static jint nativeGetDrawGLFunction(JNIEnv *env, jobject obj, jint nativeView, +static jint nativeCreateDrawGLFunction(JNIEnv *env, jobject obj, jint nativeView, jobject jrect, jobject jviewrect, jobject jvisiblerect, jfloat scale, jint extras) { @@ -830,9 +830,17 @@ static jint nativeGetDrawGLFunction(JNIEnv *env, jobject obj, jint nativeView, return (jint)functor; } -static void nativeUpdateDrawGLFunction(JNIEnv *env, jobject obj, jobject jrect, +static jint nativeGetDrawGLFunction(JNIEnv *env, jobject obj, jint nativeView) { + WebView *wvInstance = (WebView*) nativeView; + if (!wvInstance) + return 0; + + return (jint) wvInstance->getFunctor(); +} + +static void nativeUpdateDrawGLFunction(JNIEnv *env, jobject obj, jint nativeView, jobject jrect, jobject jviewrect, jobject jvisiblerect, jfloat scale) { - WebView *wvInstance = GET_NATIVE_VIEW(env, obj); + WebView *wvInstance = (WebView*) nativeView; if (wvInstance) { GLDrawFunctor* functor = (GLDrawFunctor*) wvInstance->getFunctor(); if (functor) { @@ -1233,9 +1241,11 @@ static JNINativeMethod gJavaWebViewMethods[] = { (void*) nativeDestroy }, { "nativeDraw", "(Landroid/graphics/Canvas;Landroid/graphics/RectF;IIZ)I", (void*) nativeDraw }, - { "nativeGetDrawGLFunction", "(ILandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/RectF;FI)I", + { "nativeCreateDrawGLFunction", "(ILandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/RectF;FI)I", + (void*) nativeCreateDrawGLFunction }, + { "nativeGetDrawGLFunction", "(I)I", (void*) nativeGetDrawGLFunction }, - { "nativeUpdateDrawGLFunction", "(Landroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/RectF;F)V", + { "nativeUpdateDrawGLFunction", "(ILandroid/graphics/Rect;Landroid/graphics/Rect;Landroid/graphics/RectF;F)V", (void*) nativeUpdateDrawGLFunction }, { "nativeDumpDisplayTree", "(Ljava/lang/String;)V", (void*) nativeDumpDisplayTree }, |