diff options
Diffstat (limited to 'Source/WebKit2/Shared/WebContextMenuItem.cpp')
| -rw-r--r-- | Source/WebKit2/Shared/WebContextMenuItem.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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 <WebCore/ContextMenuItem.h> -#include <wtf/NeverDestroyed.h> namespace WebKit { @@ -50,7 +49,7 @@ PassRefPtr<WebContextMenuItem> WebContextMenuItem::create(const String& title, b for (size_t i = 0; i < size; ++i) { WebContextMenuItem* item = submenuItems->at<WebContextMenuItem>(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<API::Array> WebContextMenuItem::submenuItemsAsAPIArray() const +Ref<API::Array> WebContextMenuItem::submenuItemsAsAPIArray() const { if (m_webContextMenuItemData.type() != WebCore::SubmenuType) return API::Array::create(); @@ -73,7 +72,7 @@ PassRefPtr<API::Array> 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 |