From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebKit2/Shared/WebContextMenuItem.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'Source/WebKit2/Shared/WebContextMenuItem.cpp') diff --git a/Source/WebKit2/Shared/WebContextMenuItem.cpp b/Source/WebKit2/Shared/WebContextMenuItem.cpp index ceb9a8659..ee21b46f1 100644 --- a/Source/WebKit2/Shared/WebContextMenuItem.cpp +++ b/Source/WebKit2/Shared/WebContextMenuItem.cpp @@ -31,7 +31,6 @@ #include "APIArray.h" #include -#include namespace WebKit { @@ -50,7 +49,7 @@ PassRefPtr WebContextMenuItem::create(const String& title, b for (size_t i = 0; i < size; ++i) { WebContextMenuItem* item = submenuItems->at(i); if (item) - submenu.append(*item->data()); + submenu.append(item->data()); } return adoptRef(new WebContextMenuItem(WebContextMenuItemData(WebCore::ContextMenuItemTagNoAction, title, enabled, submenu))).leakRef(); @@ -62,7 +61,7 @@ WebContextMenuItem* WebContextMenuItem::separatorItem() return separatorItem; } -PassRefPtr WebContextMenuItem::submenuItemsAsAPIArray() const +Ref WebContextMenuItem::submenuItemsAsAPIArray() const { if (m_webContextMenuItemData.type() != WebCore::SubmenuType) return API::Array::create(); @@ -73,7 +72,7 @@ PassRefPtr WebContextMenuItem::submenuItemsAsAPIArray() const for (const auto& item : m_webContextMenuItemData.submenu()) submenuItems.uncheckedAppend(WebContextMenuItem::create(item)); - return API::Array::create(std::move(submenuItems)); + return API::Array::create(WTFMove(submenuItems)); } API::Object* WebContextMenuItem::userData() const -- cgit v1.2.1