commit a9d6ca982c648d15a6fd6512ae24c2b854fd0169
author Leon Scroggins <scroggo@google.com> Thu Oct 29 09:47:34 2009 -0400
committer Leon Scroggins <scroggo@google.com> Thu Oct 29 14:43:15 2009 -0400
tree def73aacc36e86d98b740298f79c179dfb1a8f79
parent d2abd2ea0411db96b5a90df6e8cfddd8d4ddd648

Send a message when the page changes and find is up to search again.

Fixes http://b/issue?id=2222706

Requires a change in frameworks/base.

Cherry pick a change from mr2, with a slight change to JNI handling.

WebKit/android/jni/WebViewCore.cpp

diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 2dac8f4..d241970 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -190,6 +190,7 @@
     jmethodID   m_createSurface;
     jmethodID   m_updateSurface;
     jmethodID   m_destroySurface;
+    jmethodID   m_sendFindAgain;
     AutoJObject object(JNIEnv* env) {
         return getRealObject(env, m_obj);
     }
@@ -267,6 +268,7 @@
     m_javaGlue->m_createSurface = GetJMethod(env, clazz, "createSurface", "(Ljava/lang/String;Ljava/lang/String;IIIII)Landroid/webkit/ViewManager$ChildView;");
     m_javaGlue->m_updateSurface = GetJMethod(env, clazz, "updateSurface", "(Landroid/webkit/ViewManager$ChildView;IIII)V");
     m_javaGlue->m_destroySurface = GetJMethod(env, clazz, "destroySurface", "(Landroid/webkit/ViewManager$ChildView;)V");
+    m_javaGlue->m_sendFindAgain = GetJMethod(env, clazz, "sendFindAgain", "()V");
 
     env->SetIntField(javaWebViewCore, gWebViewCoreFields.m_nativeClass, (jint)this);
 
@@ -578,6 +580,14 @@
     m_domtree_version = latestVersion;
     DBG_NAV_LOG("call updateFrameCache");
     updateFrameCache();
+    if (m_findIsUp) {
+        LOG_ASSERT(m_javaGlue->m_obj,
+                "A Java widget was not associated with this view bridge!");
+        JNIEnv* env = JSC::Bindings::getJNIEnv();
+        env->CallVoidMethod(m_javaGlue->object(env).get(),
+                m_javaGlue->m_sendFindAgain);
+        checkException(env);
+    }
 }
 
 void WebViewCore::updateButtonList(WTF::Vector<Container>* buttons)