Changeset 136126 in webkit

Timestamp:

Nov 29, 2012, 6:17:30 AM (14 years ago)

Author:

michael.bruning@digia.com

Message:

[Qt][WK2] Commit the preedit string in the input method when focus is about to be moved.
​https://bugs.webkit.org/show_bug.cgi?id=97774

Reviewed by Kenneth Rohde Christiansen.

Implements the handler for willSetInputMethodState in WebKit2 in Qt.
This is needed to tell the input method instance in Qt to commit its
preedit content when the focus has moved to another node to prevent a
bug where the old preedit string was kept as the preedit string and
the editor moved focus back to the old node when continuing to enter
text via the input method.

This behavior is analog to the behavior of the QtQuick text input
elements.

• UIProcess/API/qt/raw/qrawwebview.cpp:

(QRawWebViewPrivate::handleWillSetInputMethodState):

• UIProcess/API/qt/raw/qrawwebview_p_p.h:

(QRawWebViewPrivate):

• UIProcess/PageClient.h:

(PageClient):

• UIProcess/WebPageProxy.h:

(WebPageProxy):

• UIProcess/WebPageProxy.messages.in:
• UIProcess/qt/QtPageClient.cpp:

(WebKit::QtPageClient::handleWillSetInputMethodState):
(WebKit):

• UIProcess/qt/QtPageClient.h:

(QtPageClient):

• UIProcess/qt/QtWebPageEventHandler.cpp:

(WebKit::QtWebPageEventHandler::handleWillSetInputMethodState):
(WebKit):

• UIProcess/qt/QtWebPageEventHandler.h:

(QtWebPageEventHandler):

• UIProcess/qt/WebPageProxyQt.cpp:

(WebKit::WebPageProxy::willSetInputMethodState):
(WebKit):

• WebProcess/WebCoreSupport/WebEditorClient.cpp:

(WebKit::WebEditorClient::willSetInputMethodState):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/qt/raw/qrawwebview.cpp (modified) (1 diff)
• UIProcess/API/qt/raw/qrawwebview_p_p.h (modified) (1 diff)
• UIProcess/PageClient.h (modified) (1 diff)
• UIProcess/WebPageProxy.h (modified) (1 diff)
• UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• UIProcess/qt/QtPageClient.cpp (modified) (1 diff)
• UIProcess/qt/QtPageClient.h (modified) (1 diff)
• UIProcess/qt/QtWebPageEventHandler.cpp (modified) (1 diff)
• UIProcess/qt/QtWebPageEventHandler.h (modified) (1 diff)
• UIProcess/qt/WebPageProxyQt.cpp (modified) (1 diff)
• WebProcess/WebCoreSupport/WebEditorClient.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-11-29  Michael Brüning  <michael.bruning@digia.com>
+
+        [Qt][WK2] Commit the preedit string in the input method when focus is about to be moved.
+        https://bugs.webkit.org/show_bug.cgi?id=97774
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Implements the handler for willSetInputMethodState in WebKit2 in Qt.
+        This is needed to tell the input method instance in Qt to commit its
+        preedit content when the focus has moved to another node to prevent a
+        bug where the old preedit string was kept as the preedit string and
+        the editor moved focus back to the old node when continuing to enter
+        text via the input method.
+
+        This behavior is analog to the behavior of the QtQuick text input
+        elements.
+
+        * UIProcess/API/qt/raw/qrawwebview.cpp:
+        (QRawWebViewPrivate::handleWillSetInputMethodState):
+        * UIProcess/API/qt/raw/qrawwebview_p_p.h:
+        (QRawWebViewPrivate):
+        * UIProcess/PageClient.h:
+        (PageClient):
+        * UIProcess/WebPageProxy.h:
+        (WebPageProxy):
+        * UIProcess/WebPageProxy.messages.in:
+        * UIProcess/qt/QtPageClient.cpp:
+        (WebKit::QtPageClient::handleWillSetInputMethodState):
+        (WebKit):
+        * UIProcess/qt/QtPageClient.h:
+        (QtPageClient):
+        * UIProcess/qt/QtWebPageEventHandler.cpp:
+        (WebKit::QtWebPageEventHandler::handleWillSetInputMethodState):
+        (WebKit):
+        * UIProcess/qt/QtWebPageEventHandler.h:
+        (QtWebPageEventHandler):
+        * UIProcess/qt/WebPageProxyQt.cpp:
+        (WebKit::WebPageProxy::willSetInputMethodState):
+        (WebKit):
+        * WebProcess/WebCoreSupport/WebEditorClient.cpp:
+        (WebKit::WebEditorClient::willSetInputMethodState):
+
 2012-11-28  Jocelyn Turcotte  <jocelyn.turcotte@digia.com>
 

trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview.cpp

@@ -131 +131 @@
 }
 
+void QRawWebViewPrivate::handleWillSetInputMethodState()
+{
+    notImplemented();
+}
+
 #if ENABLE(GESTURE_EVENTS)
 void QRawWebViewPrivate::doneWithGestureEvent(const WebKit::WebGestureEvent& event, bool wasEventHandled)

trunk/Source/WebKit2/UIProcess/API/qt/raw/qrawwebview_p_p.h

@@ -72 +72 @@
 
     virtual void updateTextInputState();
+    virtual void handleWillSetInputMethodState();
 #if ENABLE(GESTURE_EVENTS)
     virtual void doneWithGestureEvent(const WebKit::WebGestureEvent& event, bool wasEventHandled);

trunk/Source/WebKit2/UIProcess/PageClient.h

@@ -128 +128 @@
     virtual void handleCertificateVerificationRequest(const String& hostname, bool& ignoreErrors) = 0;
     virtual void handleProxyAuthenticationRequiredRequest(const String& hostname, uint16_t port, const String& prefilledUsername, String& username, String& password) = 0;
+    virtual void handleWillSetInputMethodState() = 0;
 #endif // PLATFORM(QT).
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -896 +896 @@
 
     void editorStateChanged(const EditorState&);
+#if PLATFORM(QT)
+    void willSetInputMethodState();
+#endif
 
     // Back/Forward list management

trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -206 +206 @@
     DidChangeCompositionSelection(bool hasChanged)
 #endif
-
+#if PLATFORM(QT)
+    WillSetInputMethodState()
+#endif
     # Find messages
     DidCountStringMatches(WTF::String string, uint32_t matchCount)

trunk/Source/WebKit2/UIProcess/qt/QtPageClient.cpp

@@ -257 +257 @@
 }
 
+void QtPageClient::handleWillSetInputMethodState()
+{
+    ASSERT(m_eventHandler);
+    m_eventHandler->handleWillSetInputMethodState();
+}
+
 #if ENABLE(GESTURE_EVENTS)
 void QtPageClient::doneWithGestureEvent(const WebGestureEvent& event, bool wasEventHandled)

trunk/Source/WebKit2/UIProcess/qt/QtPageClient.h

@@ -104 +104 @@
     virtual void didFindZoomableArea(const WebCore::IntPoint&, const WebCore::IntRect&);
     virtual void updateTextInputState();
+    virtual void handleWillSetInputMethodState();
     virtual void doneWithGestureEvent(const WebGestureEvent&, bool wasEventHandled);
 #if ENABLE(TOUCH_EVENTS)

trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.cpp

@@ -436 +436 @@
 }
 
+void QtWebPageEventHandler::handleWillSetInputMethodState()
+{
+    if (qApp->inputMethod()->isVisible())
+        qApp->inputMethod()->commit();
+}
+
 void QtWebPageEventHandler::doneWithGestureEvent(const WebGestureEvent& event, bool wasEventHandled)
 {

trunk/Source/WebKit2/UIProcess/qt/QtWebPageEventHandler.h

@@ -90 +90 @@
 #endif
     void handleInputEvent(const QInputEvent*);
+    void handleWillSetInputMethodState();
     void resetGestureRecognizers();
 

trunk/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp

@@ -172 +172 @@
 }
 
+void WebPageProxy::willSetInputMethodState()
+{
+    m_pageClient->handleWillSetInputMethodState();
+}
+
 } // namespace WebKit

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebEditorClient.cpp

@@ -470 +470 @@
 void WebEditorClient::willSetInputMethodState()
 {
-    notImplemented();
+#if PLATFORM(QT)
+    m_page->send(Messages::WebPageProxy::WillSetInputMethodState());
+#else
+    notImplemented();
+#endif
 }