Changeset 64737 in webkit

Timestamp:

Aug 5, 2010 5:40:08 AM (14 years ago)

Author:

Simon Hausmann

Message:

[Qt] Clean up the input method handling
​https://bugs.webkit.org/show_bug.cgi?id=43545

Reviewed by Tor Arne Vestbø.

WebCore:

Changed input method hint interface to be more efficient by setting
all hints in one shot, like in QWidget.

• platform/qt/QWebPageClient.h:

WebKit/qt:

Replace the way of individually setting input method hints by
many calls to QWidget::setInputMethodHints with one single call.

This is more efficient by requiring less updates in the input
method hint.

• WebCoreSupport/EditorClientQt.cpp:

(WebCore::EditorClientQt::setInputMethodState):

• WebCoreSupport/PageClientQt.cpp:

(WebCore::PageClientQWidget::setInputMethodHints):
(WebCore::PageClientQGraphicsWidget::setInputMethodHints):

• WebCoreSupport/PageClientQt.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/qt/QWebPageClient.h (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/EditorClientQt.cpp (modified) (2 diffs)
• WebKit/qt/WebCoreSupport/PageClientQt.cpp (modified) (2 diffs)
• WebKit/qt/WebCoreSupport/PageClientQt.h (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-08-05  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Clean up the input method handling
+        https://bugs.webkit.org/show_bug.cgi?id=43545
+
+        Changed input method hint interface to be more efficient by setting
+        all hints in one shot, like in QWidget.
+
+        * platform/qt/QWebPageClient.h:
+
 2010-08-05  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebCore/platform/qt/QWebPageClient.h

@@ -60 +60 @@
 
 #if QT_VERSION >= 0x040600
-    virtual void setInputMethodHint(Qt::InputMethodHint hint, bool enable) = 0;
+    virtual void setInputMethodHints(Qt::InputMethodHints hint) = 0;
 #endif
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-08-05  Simon Hausmann  <simon.hausmann@nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Clean up the input method handling
+        https://bugs.webkit.org/show_bug.cgi?id=43545
+
+        Replace the way of individually setting input method hints by
+        many calls to QWidget::setInputMethodHints with one single call.
+
+        This is more efficient by requiring less updates in the input
+        method hint.
+
+        * WebCoreSupport/EditorClientQt.cpp:
+        (WebCore::EditorClientQt::setInputMethodState):
+        * WebCoreSupport/PageClientQt.cpp:
+        (WebCore::PageClientQWidget::setInputMethodHints):
+        (WebCore::PageClientQGraphicsWidget::setInputMethodHints):
+        * WebCoreSupport/PageClientQt.h:
+
 2010-08-05  David Leong  <david.leong@nokia.com>
 

trunk/WebKit/qt/WebCoreSupport/EditorClientQt.cpp

@@ -597 +597 @@
     if (webPageClient) {
 #if QT_VERSION >= 0x040600
-        // Make sure to reset input method hint
-        webPageClient->setInputMethodHint(Qt::ImhDialableCharactersOnly, false);
-        webPageClient->setInputMethodHint(Qt::ImhDigitsOnly, false);
-        webPageClient->setInputMethodHint(Qt::ImhEmailCharactersOnly, false);
-        webPageClient->setInputMethodHint(Qt::ImhUrlCharactersOnly, false);
-        webPageClient->setInputMethodHint(Qt::ImhHiddenText, false);
+        Qt::InputMethodHints hints;
 
         HTMLInputElement* inputElement = 0;
@@ -612 +607 @@
         if (inputElement) {
             // Set input method hints for "number", "tel", "email", "url" and "password" input elements.
-            webPageClient->setInputMethodHint(Qt::ImhDialableCharactersOnly, inputElement->isTelephoneField());
-            webPageClient->setInputMethodHint(Qt::ImhDigitsOnly, inputElement->isNumberField());
-            webPageClient->setInputMethodHint(Qt::ImhEmailCharactersOnly, inputElement->isEmailField());
-            webPageClient->setInputMethodHint(Qt::ImhUrlCharactersOnly, inputElement->isUrlField());
+            if (inputElement->isTelephoneField())
+                hints |= Qt::ImhDialableCharactersOnly;
+            if (inputElement->isNumberField())
+                hints |= Qt::ImhDigitsOnly;
+            if (inputElement->isEmailField())
+                hints |= Qt::ImhEmailCharactersOnly;
+            if (inputElement->isUrlField())
+                hints |= Qt::ImhUrlCharactersOnly;
             // Setting the Qt::WA_InputMethodEnabled attribute true and Qt::ImhHiddenText flag
             // for password fields. The Qt platform is responsible for determining which widget
             // will receive input method events for password fields.
-            bool isPasswordField = inputElement->isPasswordField();
-            webPageClient->setInputMethodHint(Qt::ImhHiddenText, isPasswordField);
-            if (isPasswordField)
+            if (inputElement->isPasswordField()) {
                 active = true;
+                hints |= Qt::ImhHiddenText;
+            }
         }
 
 #if defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6) || defined(Q_OS_SYMBIAN)
         // disables auto-uppercase and predictive text for mobile devices
-        webPageClient->setInputMethodHint(Qt::ImhNoAutoUppercase, true);
-        webPageClient->setInputMethodHint(Qt::ImhNoPredictiveText, true);
+        hints |= Qt::ImhNoAutoUppercase;
+        hints |= Qt::ImhNoPredictiveText;
 #endif // Q_WS_MAEMO_5 || Q_WS_MAEMO_6 || Q_OS_SYMBIAN
+       webPageClient->setInputMethodHints(hints);
 #endif // QT_VERSION check
         webPageClient->setInputMethodEnabled(active);

trunk/WebKit/qt/WebCoreSupport/PageClientQt.cpp

@@ -50 +50 @@
 
 #if QT_VERSION >= 0x040600
-void PageClientQWidget::setInputMethodHint(Qt::InputMethodHint hint, bool enable)
-{
-    if (enable)
-        view->setInputMethodHints(view->inputMethodHints() | hint);
-    else
-        view->setInputMethodHints(view->inputMethodHints() & ~hint);
+void PageClientQWidget::setInputMethodHints(Qt::InputMethodHints hints)
+{
+    view->setInputMethodHints(hints);
 }
 #endif
@@ -234 +231 @@
 
 #if QT_VERSION >= 0x040600
-void PageClientQGraphicsWidget::setInputMethodHint(Qt::InputMethodHint hint, bool enable)
-{
-    if (enable)
-        view->setInputMethodHints(view->inputMethodHints() | hint);
-    else
-        view->setInputMethodHints(view->inputMethodHints() & ~hint);
+void PageClientQGraphicsWidget::setInputMethodHints(Qt::InputMethodHints hints)
+{
+    view->setInputMethodHints(hints);
 }
 #endif

trunk/WebKit/qt/WebCoreSupport/PageClientQt.h

@@ -60 +60 @@
     virtual bool inputMethodEnabled() const;
 #if QT_VERSION >= 0x040600
-    virtual void setInputMethodHint(Qt::InputMethodHint hint, bool enable);
+    virtual void setInputMethodHints(Qt::InputMethodHints hints);
 #endif
 
@@ -148 +148 @@
     virtual bool inputMethodEnabled() const;
 #if QT_VERSION >= 0x040600
-    virtual void setInputMethodHint(Qt::InputMethodHint hint, bool enable);
+    virtual void setInputMethodHints(Qt::InputMethodHints hints);
 #endif