Changeset 191282 in webkit

Timestamp:

Oct 19, 2015 2:13:43 AM (9 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL] Implement WebContextMenuProxyEfl::showContextMenu after r191194
​https://bugs.webkit.org/show_bug.cgi?id=150310

Patch by Hunseop Jeong <Hunseop Jeong> on 2015-10-19
Reviewed by Gyuyoung Kim.

showContextMenu() doesn't work correctly after r191194 in EFL port.
This patch implements WebContextMenuProxyEfl::showContextMenu.

• UIProcess/efl/WebContextMenuProxyEfl.cpp:

(WebKit::WebContextMenuProxyEfl::WebContextMenuProxyEfl):
(WebKit::WebContextMenuProxyEfl::showContextMenu):
(WebKit::WebContextMenuProxyEfl::hideContextMenu):

• UIProcess/efl/WebContextMenuProxyEfl.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/efl/WebContextMenuProxyEfl.cpp (modified) (3 diffs)
• UIProcess/efl/WebContextMenuProxyEfl.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-10-19  Hunseop Jeong  <hs85.jeong@samsung.com>
+
+        [EFL] Implement WebContextMenuProxyEfl::showContextMenu after r191194
+        https://bugs.webkit.org/show_bug.cgi?id=150310
+
+        Reviewed by Gyuyoung Kim.
+
+        showContextMenu() doesn't work correctly after r191194 in EFL port.
+        This patch implements WebContextMenuProxyEfl::showContextMenu.
+
+        * UIProcess/efl/WebContextMenuProxyEfl.cpp:
+        (WebKit::WebContextMenuProxyEfl::WebContextMenuProxyEfl):
+        (WebKit::WebContextMenuProxyEfl::showContextMenu):
+        (WebKit::WebContextMenuProxyEfl::hideContextMenu):
+        * UIProcess/efl/WebContextMenuProxyEfl.h:
+
 2015-10-18  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.cpp

@@ -29 +29 @@
 #if ENABLE(CONTEXT_MENUS)
 
+#include "APIContextMenuClient.h"
 #include "EwkView.h"
+#include "WebContextMenuItem.h"
 #include "WebContextMenuItemData.h"
 #include "WebPageProxy.h"
@@ -38 +40 @@
 namespace WebKit {
 
-WebContextMenuProxyEfl::WebContextMenuProxyEfl(EwkView*, WebPageProxy&, const ContextMenuContextData& context, const UserData& userData)
+WebContextMenuProxyEfl::WebContextMenuProxyEfl(EwkView* ewkView, WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
     : WebContextMenuProxy(context, userData)
+    , m_ewkView(ewkView)
+    , m_page(page)
 {
 }
@@ -49 +53 @@
 void WebContextMenuProxyEfl::showContextMenu()
 {
-    notImplemented();
+    Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
+    for (auto& item : m_context.menuItems()) {
+        if (item.action() != ContextMenuItemTagShareMenu)
+            proposedAPIItems.append(WebContextMenuItem::create(item));
+    }
+
+    Vector<RefPtr<WebContextMenuItem>> clientItems;
+    bool useProposedItems = true;
+
+    if (m_page.contextMenuClient().getContextMenuFromProposedMenu(m_page, proposedAPIItems, clientItems, m_context.webHitTestResultData(), m_page.process().transformHandlesToObjects(m_userData.object()).get()))
+        useProposedItems = false;
+
+    const Vector<RefPtr<WebContextMenuItem>>& items = useProposedItems ? proposedAPIItems : clientItems;
+
+    if (items.isEmpty())
+        return;
+
+    Vector<RefPtr<API::Object>> menuItems;
+    menuItems.reserveInitialCapacity(items.size());
+
+    for (const auto& menuItem : items)
+        menuItems.uncheckedAppend(menuItem);
+
+    if (m_ewkView)
+        m_ewkView->showContextMenu(toAPI(m_context.menuLocation()), toAPI(API::Array::create(WTF::move(menuItems)).ptr()));
 }
 

trunk/Source/WebKit2/UIProcess/efl/WebContextMenuProxyEfl.h

@@ -55 +55 @@
 private:
     WebContextMenuProxyEfl(EwkView*, WebPageProxy&, const ContextMenuContextData&, const UserData&);
+
+    EwkView* m_ewkView;
+    WebPageProxy& m_page;
 };