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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 c522c13120bc13ef90d7383e62045dc86855b146..efe5ddf5285d289bb08f0c41491bd73e5ec5610b 100644
--- a/third_party/WebKit/Source/core/page/ContextMenuController.cpp
+++ b/third_party/WebKit/Source/core/page/ContextMenuController.cpp
@@ -54,9 +54,9 @@ ContextMenuController::~ContextMenuController()
{
}
-PassOwnPtrWillBeRawPtr<ContextMenuController> ContextMenuController::create(Page* page, ContextMenuClient* client)
+RawPtr<ContextMenuController> ContextMenuController::create(Page* page, ContextMenuClient* client)
{
- return adoptPtrWillBeNoop(new ContextMenuController(page, client));
+ return new ContextMenuController(page, client);
}
DEFINE_TRACE(ContextMenuController)
@@ -94,10 +94,10 @@ void ContextMenuController::populateCustomContextMenu(const Event& event)
return;
HTMLElement& element = toHTMLElement(*node);
- RefPtrWillBeRawPtr<HTMLMenuElement> menuElement = element.assignedContextMenu();
+ RawPtr<HTMLMenuElement> menuElement = element.assignedContextMenu();
if (!menuElement || !equalIgnoringCase(menuElement->fastGetAttribute(typeAttr), "context"))
return;
- RefPtrWillBeRawPtr<RelatedEvent> relatedEvent = RelatedEvent::create(EventTypeNames::show, true, true, node);
+ RawPtr<RelatedEvent> relatedEvent = RelatedEvent::create(EventTypeNames::show, true, true, node);
if (menuElement->dispatchEvent(relatedEvent.release()) != DispatchEventResult::NotCanceled)
return;
if (menuElement != element.assignedContextMenu())
@@ -115,7 +115,7 @@ void ContextMenuController::handleContextMenuEvent(Event* event)
showContextMenu(event);
}
-void ContextMenuController::showContextMenu(Event* event, PassRefPtrWillBeRawPtr<ContextMenuProvider> menuProvider)
+void ContextMenuController::showContextMenu(Event* event, RawPtr<ContextMenuProvider> menuProvider)
{
m_menuProvider = menuProvider;
@@ -129,7 +129,7 @@ void ContextMenuController::showContextMenu(Event* event, PassRefPtrWillBeRawPtr
showContextMenu(event);
}
-void ContextMenuController::showContextMenuAtPoint(LocalFrame* frame, float x, float y, PassRefPtrWillBeRawPtr<ContextMenuProvider> menuProvider)
+void ContextMenuController::showContextMenuAtPoint(LocalFrame* frame, float x, float y, RawPtr<ContextMenuProvider> menuProvider)
{
m_menuProvider = menuProvider;

Powered by Google App Engine
This is Rietveld 408576698