Changeset 98449 in webkit

Timestamp:

Oct 26, 2011 1:29:16 AM (13 years ago)

Author:

Simon Hausmann

Message:

2011-10-20 Zeno Albisser <​zeno.albisser@nokia.com>

[Qt][WK2] Disable Context Menus until we have a proper QML implementation
​https://bugs.webkit.org/show_bug.cgi?id=70537

This is just a temporary fix to avoid crashes in QtGui based
MiniBrowser that does not link to QtWidgets.

Patch by Jocelyn Turcotte <​jocelyn.turcotte@nokia.com>,

Zeno Albisser <​zeno.albisser@nokia.com>

Reviewed by Simon Hausmann.

• UIProcess/qt/WebContextMenuProxyQt.cpp:

(WebKit::WebContextMenuProxyQt::showContextMenu):
(WebKit::WebContextMenuProxyQt::createContextMenu):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/qt/WebContextMenuProxyQt.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+ 2011-10-20  Zeno Albisser  <zeno.albisser@nokia.com>
+
+        [Qt][WK2] Disable Context Menus until we have a proper QML implementation
+        https://bugs.webkit.org/show_bug.cgi?id=70537
+
+        This is just a temporary fix to avoid crashes in QtGui based
+        MiniBrowser that does not link to QtWidgets.
+
+        Patch by Jocelyn Turcotte <jocelyn.turcotte@nokia.com>,
+                 Zeno Albisser <zeno.albisser@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        * UIProcess/qt/WebContextMenuProxyQt.cpp:
+        (WebKit::WebContextMenuProxyQt::showContextMenu):
+        (WebKit::WebContextMenuProxyQt::createContextMenu):
+
 2011-10-25  Zeno Albisser  <zeno.albisser@nokia.com>
 

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

@@ -70 +70 @@
 void WebContextMenuProxyQt::showContextMenu(const IntPoint& position, const Vector<WebContextMenuItemData>& items)
 {
-    if (items.isEmpty())
-        return;
-
-    OwnPtr<QMenu> menu = createContextMenu(items);
-
-    // We call showContextMenu(), even with no items, because the client should be able to show custom items
-    // if WebKit has nothing to show.
-    if (!menu)
-        menu = adoptPtr(new QMenu);
-
-    menu->move(position);
-    m_viewInterface->showContextMenu(QSharedPointer<QMenu>(menu.leakPtr()));
+    // FIXME: Make this a QML compatible context menu.
 }
 
@@ -91 +80 @@
 PassOwnPtr<QMenu> WebContextMenuProxyQt::createContextMenu(const Vector<WebContextMenuItemData>& items) const
 {
-    OwnPtr<QMenu> menu = adoptPtr(new QMenu);
-    for (int i = 0; i < items.size(); ++i) {
-        const WebContextMenuItemData& item = items.at(i);
-        switch (item.type()) {
-        case WebCore::CheckableActionType: /* fall through */
-        case WebCore::ActionType: {
-            QAction* qtAction = new QAction(menu.get());
-            qtAction->setData(QVariant::fromValue(item));
-            qtAction->setText(item.title());
-            qtAction->setEnabled(item.enabled());
-            qtAction->setChecked(item.checked());
-            qtAction->setCheckable(item.type() == WebCore::CheckableActionType);
-            connect(qtAction, SIGNAL(triggered(bool)), this, SLOT(actionTriggered(bool)), Qt::DirectConnection);
-
-            menu->addAction(qtAction);
-            break;
-        }
-        case WebCore::SeparatorType:
-            menu->addSeparator();
-            break;
-        case WebCore::SubmenuType:
-            if (OwnPtr<QMenu> subMenu = createContextMenu(item.submenu())) {
-                subMenu->setParent(menu.get());
-                subMenu->setTitle(item.title());
-                QMenu* const subMenuPtr = subMenu.leakPtr();
-                menu->addMenu(subMenuPtr);
-            }
-            break;
-        }
-    }
-
-    // Do not show sub-menus with just disabled actions.
-    if (menu->isEmpty())
-        return nullptr;
-
-    bool isAnyActionEnabled = false;
-    QList<QAction *> actions = menu->actions();
-    for (int i = 0; i < actions.count(); ++i) {
-        if (actions.at(i)->isVisible())
-            isAnyActionEnabled |= actions.at(i)->isEnabled();
-    }
-    if (!isAnyActionEnabled)
-        return nullptr;
-
-    return menu.release();
+    // FIXME: Make this a QML compatible context menu.
+    return nullptr;
 }