From ee4c86d1990a9e26277a6948e7027ad8d525ebfa Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 18 Oct 2012 10:55:06 +0200 Subject: Imported WebKit commit 795dcd25a9649fccaf1c9b685f6e2ffedaf7e620 (http://svn.webkit.org/repository/webkit/trunk@131718) New snapshot that includes the return of -fkeep-memory at link time to reduce memory pressure as well as modularized documentation --- Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp') diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp index f05fbf93f..510c25dbc 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitContextMenu.cpp @@ -20,10 +20,11 @@ #include "config.h" #include "WebKitContextMenu.h" +#include "ImmutableArray.h" +#include "WebContextMenuItem.h" #include "WebKitContextMenuItemPrivate.h" #include "WebKitContextMenuPrivate.h" -using namespace WebKit; using namespace WebCore; struct _WebKitContextMenuPrivate { @@ -64,12 +65,12 @@ void webkitContextMenuPopulate(WebKitContextMenu* menu, Vector& } } -WebKitContextMenu* webkitContextMenuCreate(WKArrayRef wkItems) +WebKitContextMenu* webkitContextMenuCreate(ImmutableArray* items) { WebKitContextMenu* menu = webkit_context_menu_new(); - for (size_t i = 0; i < WKArrayGetSize(wkItems); ++i) { - WKContextMenuItemRef wkItem = static_cast(WKArrayGetItemAtIndex(wkItems, i)); - webkit_context_menu_prepend(menu, webkitContextMenuItemCreate(wkItem)); + for (size_t i = 0; i < items->size(); ++i) { + WebContextMenuItem* item = static_cast(items->at(i)); + webkit_context_menu_prepend(menu, webkitContextMenuItemCreate(item)); } menu->priv->items = g_list_reverse(menu->priv->items); -- cgit v1.2.1