Changeset 74243 in webkit

Timestamp:

Dec 17, 2010 2:51:35 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2010-12-17 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

[Qt] QWebPage sends out a RequestSoftwareInputPanel event
incorrectly in particular case
​https://bugs.webkit.org/show_bug.cgi?id=50419

Add HitTestResult check before firing RequestSoftwareInputPanel event.

• Api/qwebpage.cpp: (QWebPagePrivate::mouseReleaseEvent): (QWebPagePrivate::handleSoftwareInputPanel):
• Api/qwebpage_p.h:
• tests/qwebpage/tst_qwebpage.cpp: (clickOnPage): (tst_QWebPage::inputMethods):

Location:

trunk/WebKit/qt

Files:

• Api/qwebpage.cpp (modified) (2 diffs)
• Api/qwebpage_p.h (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• tests/qwebpage/tst_qwebpage.cpp (modified) (8 diffs)

trunk/WebKit/qt/Api/qwebpage.cpp

@@ -760 +760 @@
 
     handleClipboard(ev, ev->button());
-    handleSoftwareInputPanel(ev->button());
-}
-
-void QWebPagePrivate::handleSoftwareInputPanel(Qt::MouseButton button)
+    handleSoftwareInputPanel(ev->button(), QPointF(ev->pos()).toPoint());
+}
+
+void QWebPagePrivate::handleSoftwareInputPanel(Qt::MouseButton button, const QPoint& pos)
 {
     Frame* frame = page->focusController()->focusedFrame();
@@ -775 +775 @@
             client->ownerWidget()->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel));
         if (!clickCausedFocus || behavior == QStyle::RSIP_OnMouseClick) {
-            QEvent event(QEvent::RequestSoftwareInputPanel);
-            QApplication::sendEvent(client->ownerWidget(), &event);
+            HitTestResult result = frame->eventHandler()->hitTestResultAtPoint(frame->view()->windowToContents(pos), false);
+            if (result.isContentEditable()) {
+                QEvent event(QEvent::RequestSoftwareInputPanel);
+                QApplication::sendEvent(client->ownerWidget(), &event);
+            }
         }
     }

trunk/WebKit/qt/Api/qwebpage_p.h

@@ -126 +126 @@
     void leaveEvent(QEvent*);
     void handleClipboard(QEvent*, Qt::MouseButton);
-    void handleSoftwareInputPanel(Qt::MouseButton);
+    void handleSoftwareInputPanel(Qt::MouseButton, const QPoint&);
     bool handleScrolling(QKeyEvent*, WebCore::Frame*);
 

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-12-17  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] QWebPage sends out a RequestSoftwareInputPanel event 
+        incorrectly in particular case
+        https://bugs.webkit.org/show_bug.cgi?id=50419
+
+        Add HitTestResult check before firing RequestSoftwareInputPanel event.
+
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::mouseReleaseEvent):
+        (QWebPagePrivate::handleSoftwareInputPanel):
+        * Api/qwebpage_p.h:
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (clickOnPage):
+        (tst_QWebPage::inputMethods):
+
 2010-12-17  Eric Seidel  <eric@webkit.org>
 

trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

@@ -1393 +1393 @@
 }
 
+static void clickOnPage(QWebPage* page, const QPoint& position)
+{
+    QMouseEvent evpres(QEvent::MouseButtonPress, position, Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
+    page->event(&evpres);
+    QMouseEvent evrel(QEvent::MouseButtonRelease, position, Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
+    page->event(&evrel);
+}
+
 void tst_QWebPage::inputMethods()
 {
@@ -1429 +1437 @@
 
     QWebElementCollection inputs = page->mainFrame()->documentElement().findAll("input");
-
-    QMouseEvent evpres(QEvent::MouseButtonPress, inputs.at(0).geometry().center(), Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
-    page->event(&evpres);
-    QMouseEvent evrel(QEvent::MouseButtonRelease, inputs.at(0).geometry().center(), Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
-    page->event(&evrel);
+    QPoint textInputCenter = inputs.at(0).geometry().center();
+
+    clickOnPage(page, textInputCenter);
 
     // This part of the test checks if the SIP (Software Input Panel) is triggered,
@@ -1458 +1464 @@
     viewEventSpy.clear();
 
-    page->event(&evpres);
-    page->event(&evrel);
+    clickOnPage(page, textInputCenter);
     QVERIFY(viewEventSpy.contains(QEvent::RequestSoftwareInputPanel));
 
@@ -1561 +1566 @@
     // Deselect the selection by sending MouseButtonPress events
     // This moves the current cursor to the end of the text
-    page->event(&evpres);
-    page->event(&evrel);
+    clickOnPage(page, textInputCenter);
 
     {
@@ -1610 +1614 @@
     //RIGHT to LEFT selection
     //Deselect the selection (this moves the current cursor to the end of the text)
-    page->event(&evpres);
-    page->event(&evrel);
+    clickOnPage(page, textInputCenter);
 
     //ImAnchorPosition
@@ -1658 +1661 @@
 
     //ImhHiddenText
-    QMouseEvent evpresPassword(QEvent::MouseButtonPress, inputs.at(1).geometry().center(), Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
-    page->event(&evpresPassword);
-    QMouseEvent evrelPassword(QEvent::MouseButtonRelease, inputs.at(1).geometry().center(), Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
-    page->event(&evrelPassword);
+    QPoint passwordInputCenter = inputs.at(1).geometry().center();
+    clickOnPage(page, passwordInputCenter);
 
     QVERIFY(inputMethodEnabled(view));
     QVERIFY(inputMethodHints(view) & Qt::ImhHiddenText);
 
-    page->event(&evpres);
-    page->event(&evrel);
+    clickOnPage(page, textInputCenter);
     QVERIFY(!(inputMethodHints(view) & Qt::ImhHiddenText));
 
@@ -1674 +1674 @@
 
     QWebElement para = page->mainFrame()->findFirstElement("p");
-    {
-        QMouseEvent evpres(QEvent::MouseButtonPress, para.geometry().center(), Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
-        page->event(&evpres);
-        QMouseEvent evrel(QEvent::MouseButtonRelease, para.geometry().center(), Qt::LeftButton, Qt::NoButton, Qt::NoModifier);
-        page->event(&evrel);
-    }
+    clickOnPage(page, para.geometry().center());
 
     QVERIFY(!viewEventSpy.contains(QEvent::RequestSoftwareInputPanel));
@@ -2005 +2000 @@
     QCOMPARE(anchorPosition, 12);
 
+    // Check sending RequestSoftwareInputPanel event
+    page->mainFrame()->setHtml("<html><body>" \
+                                            "<input type='text' id='input5' value='QtWebKit inputMethod'/>" \
+                                            "<div id='btnDiv' onclick='i=document.getElementById(&quot;input5&quot;); i.focus();'>abc</div>"\
+                                            "</body></html>");
+    QWebElement inputElement = page->mainFrame()->findFirstElement("div");
+    clickOnPage(page, inputElement.geometry().center());
+
+    QVERIFY(!viewEventSpy.contains(QEvent::RequestSoftwareInputPanel));
     delete container;
 }