diff options
| author | Shimeng (Simon) Wang <swang@google.com> | 2010-07-29 17:21:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-07-29 17:21:31 -0700 |
| commit | eaa543700296fbdd6583bd8dc68108e6a734d7d1 (patch) | |
| tree | d01b1a7a534c06e6a387213630252da01fc0df2f | |
| parent | f201bd07e77865a9e952fa003b8fe87dba1945b4 (diff) | |
| parent | abaf8628154a468ecb6db12aa9bd9c84126de5ab (diff) | |
| download | external_webkit-eaa543700296fbdd6583bd8dc68108e6a734d7d1.zip external_webkit-eaa543700296fbdd6583bd8dc68108e6a734d7d1.tar.gz external_webkit-eaa543700296fbdd6583bd8dc68108e6a734d7d1.tar.bz2 | |
Merge "Add back nativeClearContent since it's used in Java side."
| -rw-r--r-- | WebKit/android/jni/WebViewCore.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp index 2b66a8e..3da678e 100644 --- a/WebKit/android/jni/WebViewCore.cpp +++ b/WebKit/android/jni/WebViewCore.cpp @@ -2815,6 +2815,15 @@ static jstring RequestLabel(JNIEnv *env, jobject obj, int framePointer, (WebCore::Frame*) framePointer, (WebCore::Node*) nodePointer)); } +static void ClearContent(JNIEnv *env, jobject obj) +{ +#ifdef ANDROID_INSTRUMENT + TimeCounterAuto counter(TimeCounter::WebViewCoreTimeCounter); +#endif + WebViewCore* viewImpl = GET_NATIVE_VIEW(env, obj); + viewImpl->clearContent(); +} + static void UpdateFrameCacheIfLoading(JNIEnv *env, jobject obj) { GET_NATIVE_VIEW(env, obj)->updateFrameCacheIfLoading(); @@ -3428,6 +3437,8 @@ static jobject GetTouchHighlightRects(JNIEnv* env, jobject obj, jint x, jint y, * JNI registration. */ static JNINativeMethod gJavaWebViewCoreMethods[] = { + { "nativeClearContent", "()V", + (void*) ClearContent }, { "nativeFocusBoundsChanged", "()Z", (void*) FocusBoundsChanged } , { "nativeKey", "(IIIZZZZ)Z", |