Changeset 226602 in webkit

Timestamp:

Jan 8, 2018 5:53:29 PM (6 years ago)

Author:

achristensen@apple.com

Message:

Pass around Vector<Ref<WebContextMenuItem>> instead of WKArrayRef or Vector<WebContextMenuItemData>
​https://bugs.webkit.org/show_bug.cgi?id=181419

Reviewed by Tim Horton.

Passing a WKArrayRef to an API object is messy and was preventing me from moving things around and making ObjC SPI.
No change in behavior. Just using different layering abstractions for the same data.

• UIProcess/API/C/WKContextMenuListener.cpp:

(WKContextMenuListenerUseContextMenuItems):

• UIProcess/WebContextMenuListenerProxy.cpp:

(WebKit::WebContextMenuListenerProxy::useContextMenuItems):

• UIProcess/WebContextMenuListenerProxy.h:
• UIProcess/WebContextMenuProxy.h:
• UIProcess/mac/WebContextMenuProxyMac.h:
• UIProcess/mac/WebContextMenuProxyMac.mm:

(WebKit::WebContextMenuProxyMac::showContextMenuWithItems):
(WebKit::WebContextMenuProxyMac::showContextMenu):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKContextMenuListener.cpp (modified) (2 diffs)
• UIProcess/WebContextMenuListenerProxy.cpp (modified) (1 diff)
• UIProcess/WebContextMenuListenerProxy.h (modified) (1 diff)
• UIProcess/WebContextMenuProxy.h (modified) (1 diff)
• UIProcess/gtk/WebContextMenuProxyGtk.cpp (modified) (1 diff)
• UIProcess/gtk/WebContextMenuProxyGtk.h (modified) (1 diff)
• UIProcess/mac/WebContextMenuProxyMac.h (modified) (1 diff)
• UIProcess/mac/WebContextMenuProxyMac.mm (modified) (2 diffs)
• UIProcess/wpe/WebContextMenuProxyWPE.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2018-01-08  Alex Christensen  <achristensen@webkit.org>
+
+        Pass around Vector<Ref<WebContextMenuItem>> instead of WKArrayRef or Vector<WebContextMenuItemData>
+        https://bugs.webkit.org/show_bug.cgi?id=181419
+
+        Reviewed by Tim Horton.
+
+        Passing a WKArrayRef to an API object is messy and was preventing me from moving things around and making ObjC SPI.
+        No change in behavior.  Just using different layering abstractions for the same data.
+
+        * UIProcess/API/C/WKContextMenuListener.cpp:
+        (WKContextMenuListenerUseContextMenuItems):
+        * UIProcess/WebContextMenuListenerProxy.cpp:
+        (WebKit::WebContextMenuListenerProxy::useContextMenuItems):
+        * UIProcess/WebContextMenuListenerProxy.h:
+        * UIProcess/WebContextMenuProxy.h:
+        * UIProcess/mac/WebContextMenuProxyMac.h:
+        * UIProcess/mac/WebContextMenuProxyMac.mm:
+        (WebKit::WebContextMenuProxyMac::showContextMenuWithItems):
+        (WebKit::WebContextMenuProxyMac::showContextMenu):
+
 2018-01-08  John Wilander  <wilander@apple.com>
 

trunk/Source/WebKit/UIProcess/API/C/WKContextMenuListener.cpp

@@ -27 +27 @@
 #include "WKContextMenuListener.h"
 
+#include "APIArray.h"
 #include "WKAPICast.h"
+#include "WebContextMenuItem.h"
 #include "WebContextMenuListenerProxy.h"
 
@@ -41 +43 @@
 }
 
-void WKContextMenuListenerUseContextMenuItems(WKContextMenuListenerRef listenerRef, WKArrayRef items)
+void WKContextMenuListenerUseContextMenuItems(WKContextMenuListenerRef listenerRef, WKArrayRef arrayRef)
 {
 #if ENABLE(CONTEXT_MENUS)
-    toImpl(listenerRef)->useContextMenuItems(items);
+    RefPtr<API::Array> array = toImpl(arrayRef);
+    size_t newSize = array ? array->size() : 0;
+    Vector<Ref<WebContextMenuItem>> items;
+    items.reserveInitialCapacity(newSize);
+    for (size_t i = 0; i < newSize; ++i) {
+        WebContextMenuItem* item = array->at<WebContextMenuItem>(i);
+        if (!item)
+            continue;
+        
+        items.uncheckedAppend(*item);
+    }
+
+    toImpl(listenerRef)->useContextMenuItems(WTFMove(items));
 #else
     UNUSED_PARAM(listenerRef);

trunk/Source/WebKit/UIProcess/WebContextMenuListenerProxy.cpp

@@ -48 +48 @@
 }
 
-void WebContextMenuListenerProxy::useContextMenuItems(WKArrayRef items)
+void WebContextMenuListenerProxy::useContextMenuItems(Vector<Ref<WebContextMenuItem>>&& items)
 {
     if (!m_contextMenuMac)
         return;
 
-    RefPtr<API::Array> array = toImpl(items);
-    size_t newSize = array ? array->size() : 0;
-    Vector<WebContextMenuItemData> dataItems;
-    dataItems.reserveInitialCapacity(newSize);
-    for (size_t i = 0; i < newSize; ++i) {
-        WebContextMenuItem* item = array->at<WebContextMenuItem>(i);
-        if (!item)
-            continue;
-
-        dataItems.uncheckedAppend(item->data());
-    }
-
-    m_contextMenuMac->showContextMenuWithItems(WTFMove(dataItems));
+    m_contextMenuMac->showContextMenuWithItems(WTFMove(items));
 }
 

trunk/Source/WebKit/UIProcess/WebContextMenuListenerProxy.h

@@ -45 +45 @@
     virtual ~WebContextMenuListenerProxy();
 
-    void useContextMenuItems(WKArrayRef items);
+    void useContextMenuItems(Vector<Ref<WebContextMenuItem>>&&);
 
     void invalidate();

trunk/Source/WebKit/UIProcess/WebContextMenuProxy.h

@@ -42 +42 @@
     virtual void show() = 0;
 
-    virtual void showContextMenuWithItems(Vector<WebContextMenuItemData>&&) = 0;
+    virtual void showContextMenuWithItems(const Vector<Ref<WebContextMenuItem>>&) = 0;
 
 protected:

trunk/Source/WebKit/UIProcess/gtk/WebContextMenuProxyGtk.cpp

@@ -176 +176 @@
 }
 
-void WebContextMenuProxyGtk::showContextMenuWithItems(Vector<WebContextMenuItemData>&&)
+void WebContextMenuProxyGtk::showContextMenuWithItems(const Vector<Ref<WebContextMenuItem>>&)
 {
 }

trunk/Source/WebKit/UIProcess/gtk/WebContextMenuProxyGtk.h

@@ -56 +56 @@
     WebContextMenuProxyGtk(GtkWidget*, WebPageProxy&, ContextMenuContextData&&, const UserData&);
     void show() override;
-    void showContextMenuWithItems(Vector<WebContextMenuItemData>&&) override;
+    void showContextMenuWithItems(const Vector<Ref<WebContextMenuItem>>&) override;
     void append(GMenu*, const WebContextMenuItemGlib&);
     GRefPtr<GMenu> buildMenu(const Vector<WebContextMenuItemGlib>&);

trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.h

@@ -55 +55 @@
 
     void contextMenuItemSelected(const WebContextMenuItemData&);
-    void showContextMenuWithItems(Vector<WebContextMenuItemData>&&) override;
+    void showContextMenuWithItems(const Vector<Ref<WebContextMenuItem>>&) override;
 
 #if ENABLE(SERVICE_CONTROLS)

trunk/Source/WebKit/UIProcess/mac/WebContextMenuProxyMac.mm

@@ -452 +452 @@
 }
 
-void WebContextMenuProxyMac::showContextMenuWithItems(Vector<WebContextMenuItemData>&& items)
-{
-    auto menu = createContextMenuFromItems(items);
+void WebContextMenuProxyMac::showContextMenuWithItems(const Vector<Ref<WebContextMenuItem>>& items)
+{
+    Vector<WebContextMenuItemData> data;
+    data.reserveInitialCapacity(items.size());
+    for (auto& item : items)
+        data.uncheckedAppend(item->data());
+    
+    auto menu = createContextMenuFromItems(data);
     [[WKMenuTarget sharedMenuTarget] setMenuProxy:this];
     m_menu = m_page.contextMenuClient().menuFromProposedMenu(m_page, menu.get(), m_context.webHitTestResultData(), m_userData.object());
@@ -494 +499 @@
         return;
 
-    Vector<WebContextMenuItemData> items;
-    for (auto& item : (useProposedItems ? proposedAPIItems : clientItems))
-        items.append(item->data());
-
+    auto&& items = WTFMove(useProposedItems ? proposedAPIItems : clientItems);
+    
     if (items.isEmpty())
         return;
 
-    showContextMenuWithItems(WTFMove(items));
+    showContextMenuWithItems(items);
 }
 

trunk/Source/WebKit/UIProcess/wpe/WebContextMenuProxyWPE.h

@@ -37 +37 @@
     }
 
-    void showContextMenuWithItems(Vector<WebContextMenuItemData>&&) final { }
+    void showContextMenuWithItems(const Vector<Ref<WebContextMenuItem>>&) final { }
     void show() final { };