Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(99)

Unified Diff: third_party/WebKit/Source/core/page/ContextMenuController.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/page/ContextMenuController.cpp
diff --git a/third_party/WebKit/Source/core/page/ContextMenuController.cpp b/third_party/WebKit/Source/core/page/ContextMenuController.cpp
index 97f5b893e46dcdeb6c688e53c54deb23b1fa5960..d388d1e520d367e96f113bfbd2c501f19911a9e3 100644
--- a/third_party/WebKit/Source/core/page/ContextMenuController.cpp
+++ b/third_party/WebKit/Source/core/page/ContextMenuController.cpp
@@ -39,8 +39,6 @@
#include "core/page/CustomContextMenuProvider.h"
#include "platform/ContextMenu.h"
#include "platform/ContextMenuItem.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
namespace blink {
@@ -146,7 +144,7 @@ void ContextMenuController::showContextMenuAtPoint(LocalFrame* frame, float x, f
showContextMenu(nullptr);
}
-std::unique_ptr<ContextMenu> ContextMenuController::createContextMenu(Event* event)
+PassOwnPtr<ContextMenu> ContextMenuController::createContextMenu(Event* event)
{
ASSERT(event);
@@ -157,7 +155,7 @@ std::unique_ptr<ContextMenu> ContextMenuController::createContextMenu(Event* eve
return createContextMenu(event->target()->toNode()->document().frame(), mouseEvent->absoluteLocation());
}
-std::unique_ptr<ContextMenu> ContextMenuController::createContextMenu(LocalFrame* frame, const LayoutPoint& location)
+PassOwnPtr<ContextMenu> ContextMenuController::createContextMenu(LocalFrame* frame, const LayoutPoint& location)
{
HitTestRequest::HitTestRequestType type = HitTestRequest::ReadOnly | HitTestRequest::Active;
HitTestResult result(type, location);
@@ -170,7 +168,7 @@ std::unique_ptr<ContextMenu> ContextMenuController::createContextMenu(LocalFrame
m_hitTestResult = result;
- return wrapUnique(new ContextMenu);
+ return adoptPtr(new ContextMenu);
}
void ContextMenuController::showContextMenu(Event* event)

Powered by Google App Engine
This is Rietveld 408576698