summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShimeng (Simon) Wang <swang@google.com>2010-07-29 16:32:54 -0700
committerShimeng (Simon) Wang <swang@google.com>2010-07-29 16:32:54 -0700
commitabaf8628154a468ecb6db12aa9bd9c84126de5ab (patch)
treed29b1644ad94ca940a6ed05688566fa5a617a6ef
parent767966411f0c19c445f74d2ff90ab9490c290026 (diff)
downloadexternal_webkit-abaf8628154a468ecb6db12aa9bd9c84126de5ab.zip
external_webkit-abaf8628154a468ecb6db12aa9bd9c84126de5ab.tar.gz
external_webkit-abaf8628154a468ecb6db12aa9bd9c84126de5ab.tar.bz2
Add back nativeClearContent since it's used in Java side.
issue: 2841402 Change-Id: Ia147b39f84be91a92dd4f491e8d3de263df4244b
-rw-r--r--WebKit/android/jni/WebViewCore.cpp11
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",