Changeset 77906 in webkit

Timestamp:

Feb 7, 2011 10:59:04 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-02-07 Aparna Nandyal <​aparna.nand@wipro.com>

Reviewed by Andreas Kling.

[Qt] - Context menu needs "Copy" as well when the selected text is a link.
​https://bugs.webkit.org/show_bug.cgi?id=40983

Added copy option for Qt platform if selection is a link.
Added a test in tst_qwebpage.cpp.

• page/ContextMenuController.cpp: (WebCore::ContextMenuController::populate):

2011-02-07 Aparna Nandyal <​aparna.nand@wipro.com>

Reviewed by Andreas Kling.

[Qt] - Context menu needs "Copy" as well when the selected text is a link.
​https://bugs.webkit.org/show_bug.cgi?id=40983

Added a test case to create a context sensitive menu.
A check is made if it has Copy menu item when user
selects a link and opens context menu.

• tests/qwebpage/tst_qwebpage.cpp: (tst_QWebPage::contextMenuCopy):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/ContextMenuController.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-07  Aparna Nandyal  <aparna.nand@wipro.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] - Context menu needs "Copy" as well when the selected text is a link.
+        https://bugs.webkit.org/show_bug.cgi?id=40983
+
+        Added copy option for Qt platform if selection is a link. 
+        Added a test in tst_qwebpage.cpp. 
+
+        * page/ContextMenuController.cpp:
+        (WebCore::ContextMenuController::populate):
+
 2011-02-07  Mike Reed  <reed@google.com>
 

trunk/Source/WebCore/page/ContextMenuController.cpp

@@ -718 +718 @@
                 appendItem(DownloadFileItem, m_contextMenu.get());
             }
+#if PLATFORM(QT)
+            if (m_hitTestResult.isSelected()) 
+                appendItem(CopyItem, m_contextMenu.get());
+#endif
             appendItem(CopyLinkItem, m_contextMenu.get());
         }

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-02-07  Aparna Nandyal  <aparna.nand@wipro.com>
+
+        Reviewed by Andreas Kling.
+
+        [Qt] - Context menu needs "Copy" as well when the selected text is a link.
+        https://bugs.webkit.org/show_bug.cgi?id=40983
+    
+        Added a test case to create a context sensitive menu.
+        A check is made if it has Copy menu item when user
+        selects a link and opens context menu.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (tst_QWebPage::contextMenuCopy):
+
 2011-02-07  Benjamin Poulain  <ikipou@gmail.com>
 

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

@@ -79 +79 @@
     void cleanupTestCase();
 
+    void contextMenuCopy();
     void acceptNavigationRequest();
     void geolocationRequestJS();
@@ -2770 +2771 @@
 #endif
 
+void tst_QWebPage::contextMenuCopy()
+{
+    QWebView view;
+
+    view.setHtml("<a href=\"http://www.google.com\">You cant miss this</a>");
+
+    view.page()->triggerAction(QWebPage::SelectAll);
+    QVERIFY(!view.page()->selectedText().isEmpty());
+
+    QWebElement link = view.page()->mainFrame()->findFirstElement("a");
+    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();
+    int index = list.indexOf(view.page()->action(QWebPage::Copy));
+    QVERIFY(index != -1);
+}
 QTEST_MAIN(tst_QWebPage)
 #include "tst_qwebpage.moc"