Changeset 89744 in webkit

Timestamp:

Jun 25, 2011 10:44:20 AM (13 years ago)

Author:

robert@webkit.org

Message:

2011-06-20 Robert Hogan <​robert@webkit.org>

Reviewed by Antonio Gomes.

[Qt] Duplicate entry in context menu
​https://bugs.webkit.org/show_bug.cgi?id=62139

contextMenuController()->populate() is called from
ContextMenuController::handleContextMenuEvent() so
QWebPage::updatePositionDependentActions() does not need
to call it independently.

Related changesets:

​http://trac.webkit.org/changeset/73535
​http://trac.webkit.org/changeset/32389

• Api/qwebpage.cpp: (QWebPage::updatePositionDependentActions):
• tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::contextMenuCopy): (tst_QWebPage::contextMenuPopulatedOnce):

Location:

trunk/Source/WebKit/qt

Files:

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

trunk/Source/WebKit/qt/Api/qwebpage.cpp

@@ -3306 +3306 @@
     d->createMainFrame();
     WebCore::Frame* focusedFrame = d->page->focusController()->focusedOrMainFrame();
+
     HitTestResult result = focusedFrame->eventHandler()->hitTestResultAtPoint(focusedFrame->view()->windowToContents(pos), /*allowShadowContent*/ false);
-
     if (result.scrollbar())
         d->hitTestResult = QWebHitTestResult();
     else
         d->hitTestResult = QWebHitTestResult(new QWebHitTestResultPrivate(result));
-
     d->page->contextMenuController()->setHitTestResult(result);
-    d->page->contextMenuController()->populate();
-    
+
 #if ENABLE(INSPECTOR)
     if (d->page->inspectorController()->enabled())

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-06-20  Robert Hogan  <robert@webkit.org>
+
+        Reviewed by Antonio Gomes.
+
+        [Qt] Duplicate entry in context menu
+        https://bugs.webkit.org/show_bug.cgi?id=62139
+
+        contextMenuController()->populate() is called from
+        ContextMenuController::handleContextMenuEvent() so
+        QWebPage::updatePositionDependentActions() does not need
+        to call it independently.
+
+        Related changesets: 
+         http://trac.webkit.org/changeset/73535
+         http://trac.webkit.org/changeset/32389
+
+        * Api/qwebpage.cpp:
+        (QWebPage::updatePositionDependentActions):
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::contextMenuCopy):
+        (tst_QWebPage::contextMenuPopulatedOnce):
+
 2011-06-24  Dominic Cooney  <dominicc@chromium.org>
 

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

@@ -91 +91 @@
     void cleanupTestCase();
     void contextMenuCopy();
+    void contextMenuPopulatedOnce();
     void acceptNavigationRequest();
     void geolocationRequestJS();
@@ -2974 +2975 @@
 }
 
+// https://bugs.webkit.org/show_bug.cgi?id=62139
+void tst_QWebPage::contextMenuPopulatedOnce()
+{
+    QWebView view;
+
+    view.setHtml("<input type=\"text\">");
+
+    QWebElement link = view.page()->mainFrame()->findFirstElement("input");
+    QPoint pos(link.geometry().center());
+    QContextMenuEvent event(QContextMenuEvent::Mouse, pos);
+    view.page()->swallowContextMenuEvent(&event);
+    view.page()->updatePositionDependentActions(pos);
+
+    QList<QMenu*> contextMenus = view.findChildren<QMenu*>();
+    QVERIFY(!contextMenus.isEmpty());
+    QMenu* contextMenu = contextMenus.first();
+    QVERIFY(contextMenu);
+
+    QList<QAction *> list = contextMenu->actions();
+    QStringList entries;
+    while (!list.isEmpty()) {
+        QString entry = list.takeFirst()->text();
+        QVERIFY(!entries.contains(entry));
+        entries << entry;
+    }
+}
+
 void tst_QWebPage::deleteQWebViewTwice()
 {