Changeset 185825 in webkit

Timestamp:

Jun 22, 2015, 5:42:33 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

REGRESSION(r182303): [GTK] Context menu API is broken since r182303
​https://bugs.webkit.org/show_bug.cgi?id=146202

Reviewed by Žan Doberšek.

The problem is that ContextMenuclient API changed in r182303, but
we didn't notice it either, and the default handler for
getContextMenuFromProposedMenu was executed. An override keyword
would have caught this.

• UIProcess/API/gtk/WebKitContextMenuClient.cpp: Build a Vector of

WebContextMenuItemData as expected by our API, and add add
override keyword to ensure this doesn't happen again.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitContextMenuClient.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-06-22  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        REGRESSION(r182303): [GTK] Context menu API is broken since r182303
+        https://bugs.webkit.org/show_bug.cgi?id=146202
+
+        Reviewed by Žan Doberšek.
+
+        The problem is that ContextMenuclient API changed in r182303, but
+        we didn't notice it either, and the default handler for
+        getContextMenuFromProposedMenu was executed. An override keyword
+        would have caught this.
+
+        * UIProcess/API/gtk/WebKitContextMenuClient.cpp: Build a Vector of
+        WebContextMenuItemData as expected by our API, and add add
+        override keyword to ensure this doesn't happen again.
+
 2015-06-22  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenuClient.cpp

@@ -22 +22 @@
 
 #include "APIContextMenuClient.h"
+#include "WebContextMenuItem.h"
 #include "WebKitWebViewBasePrivate.h"
 #include "WebKitWebViewPrivate.h"
@@ -35 +36 @@
 
 private:
-    bool getContextMenuFromProposedMenu(WebPageProxy&, const Vector<WebContextMenuItemData>& proposedMenu, Vector<WebContextMenuItemData>&, const WebHitTestResult::Data& hitTestResultData, API::Object* userData)
+    bool getContextMenuFromProposedMenu(WebPageProxy&, const Vector<RefPtr<WebContextMenuItem>>& proposedMenu, Vector<RefPtr<WebContextMenuItem>>&, const WebHitTestResult::Data& hitTestResultData, API::Object* userData) override
     {
         GRefPtr<GVariant> variant;
@@ -43 +44 @@
             variant = adoptGRef(g_variant_parse(nullptr, userDataString.data(), userDataString.data() + userDataString.length(), nullptr, nullptr));
         }
-        webkitWebViewPopulateContextMenu(m_webView, proposedMenu, hitTestResultData, variant.get());
+
+        Vector<WebContextMenuItemData> menuItems;
+        menuItems.reserveInitialCapacity(proposedMenu.size());
+        for (auto& item : proposedMenu)
+            menuItems.uncheckedAppend(*item->data());
+        webkitWebViewPopulateContextMenu(m_webView, menuItems, hitTestResultData, variant.get());
         return true;
     }