diff options
author | John Reck <jreck@google.com> | 2011-10-19 19:08:10 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-10-19 19:08:10 -0700 |
commit | 4bb95ac7a6cc45eb1e2846bd36585220a92bfd90 (patch) | |
tree | 093d59f7fd2331e554e223e1a1abec5a2cae2ff5 | |
parent | 2e2ffd359fd732f6c99f43cd0bd96c372d33c1f9 (diff) | |
parent | 94cabcbdc194d4a28d31cfb82be98a287b8cf1c9 (diff) | |
download | external_webkit-4bb95ac7a6cc45eb1e2846bd36585220a92bfd90.zip external_webkit-4bb95ac7a6cc45eb1e2846bd36585220a92bfd90.tar.gz external_webkit-4bb95ac7a6cc45eb1e2846bd36585220a92bfd90.tar.bz2 |
am 94cabcbd: Merge "Force a navcache update before requesting keyboard" into ics-mr0
* commit '94cabcbdc194d4a28d31cfb82be98a287b8cf1c9':
Force a navcache update before requesting keyboard
-rw-r--r-- | Source/WebKit/android/jni/WebViewCore.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp index f35f768..d7a61aa 100644 --- a/Source/WebKit/android/jni/WebViewCore.cpp +++ b/Source/WebKit/android/jni/WebViewCore.cpp @@ -3367,6 +3367,10 @@ bool WebViewCore::handleMouseClick(WebCore::Frame* framePtr, WebCore::Node* node if (!fake) { RenderTextControl* rtc = static_cast<RenderTextControl*> (renderer); + // Force an update of the navcache as this will fire off a + // message to WebView that *must* have an updated focus. + m_frameCacheOutOfDate = true; + updateFrameCache(); requestKeyboardWithSelection(focusNode, rtc->selectionStart(), rtc->selectionEnd()); } |