Force a navcache update before requesting keyboard

 Bug: 5453541

Change-Id: I209d96d6cd567f7d548549e3e9e5004df045226b

1 files changed, 4 insertions, 0 deletions

diff --git a/Source/WebKit/android/jni/WebViewCore.cpp b/Source/WebKit/android/jni/WebViewCore.cpp
index f35f7686a..d7a61aac2 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());
                 }