summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-10-19 19:05:44 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-10-19 19:05:44 -0700
commit94cabcbdc194d4a28d31cfb82be98a287b8cf1c9 (patch)
tree85137a79a675029ce1fb77a9a6a13b372f24fab7 /Source
parent81fab713750af480b451fbd9926b7d76b7017551 (diff)
parent5718420083b3f3f3e275bd7cc69477634b8f6d3f (diff)
downloadexternal_webkit-94cabcbdc194d4a28d31cfb82be98a287b8cf1c9.zip
external_webkit-94cabcbdc194d4a28d31cfb82be98a287b8cf1c9.tar.gz
external_webkit-94cabcbdc194d4a28d31cfb82be98a287b8cf1c9.tar.bz2
Merge "Force a navcache update before requesting keyboard" into ics-mr0
Diffstat (limited to 'Source')
-rw-r--r--Source/WebKit/android/jni/WebViewCore.cpp4
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());
}