Index: third_party/WebKit/Source/core/loader/EmptyClients.cpp |
diff --git a/third_party/WebKit/Source/core/loader/EmptyClients.cpp b/third_party/WebKit/Source/core/loader/EmptyClients.cpp |
index 3505f77d92560ef2eb15ed571c27a52fcce51a96..decc95742b68407beab73c13b9b8e16e3e90b40c 100644 |
--- a/third_party/WebKit/Source/core/loader/EmptyClients.cpp |
+++ b/third_party/WebKit/Source/core/loader/EmptyClients.cpp |
@@ -45,7 +45,7 @@ namespace blink { |
void fillWithEmptyClients(Page::PageClients& pageClients) |
{ |
- DEFINE_STATIC_LOCAL(OwnPtrWillBePersistent<ChromeClient>, dummyChromeClient, (EmptyChromeClient::create())); |
+ DEFINE_STATIC_LOCAL(Persistent<ChromeClient>, dummyChromeClient, (EmptyChromeClient::create())); |
pageClients.chromeClient = dummyChromeClient.get(); |
DEFINE_STATIC_LOCAL(EmptyContextMenuClient, dummyContextMenuClient, ()); |
@@ -86,17 +86,17 @@ WebTaskRunner* EmptyFrameScheduler::timerTaskRunner() |
return Platform::current()->currentThread()->getWebTaskRunner(); |
} |
-PassRefPtrWillBeRawPtr<PopupMenu> EmptyChromeClient::openPopupMenu(LocalFrame&, HTMLSelectElement&) |
+RawPtr<PopupMenu> EmptyChromeClient::openPopupMenu(LocalFrame&, HTMLSelectElement&) |
{ |
- return adoptRefWillBeNoop(new EmptyPopupMenu()); |
+ return new EmptyPopupMenu(); |
} |
-PassOwnPtrWillBeRawPtr<ColorChooser> EmptyChromeClient::openColorChooser(LocalFrame*, ColorChooserClient*, const Color&) |
+RawPtr<ColorChooser> EmptyChromeClient::openColorChooser(LocalFrame*, ColorChooserClient*, const Color&) |
{ |
return nullptr; |
} |
-PassRefPtrWillBeRawPtr<DateTimeChooser> EmptyChromeClient::openDateTimeChooser(DateTimeChooserClient*, const DateTimeChooserParameters&) |
+RawPtr<DateTimeChooser> EmptyChromeClient::openDateTimeChooser(DateTimeChooserClient*, const DateTimeChooserParameters&) |
{ |
return nullptr; |
} |
@@ -137,17 +137,17 @@ void EmptyFrameLoaderClient::dispatchWillSubmitForm(HTMLFormElement*) |
{ |
} |
-PassRefPtrWillBeRawPtr<DocumentLoader> EmptyFrameLoaderClient::createDocumentLoader(LocalFrame* frame, const ResourceRequest& request, const SubstituteData& substituteData) |
+RawPtr<DocumentLoader> EmptyFrameLoaderClient::createDocumentLoader(LocalFrame* frame, const ResourceRequest& request, const SubstituteData& substituteData) |
{ |
return DocumentLoader::create(frame, request, substituteData); |
} |
-PassRefPtrWillBeRawPtr<LocalFrame> EmptyFrameLoaderClient::createFrame(const FrameLoadRequest&, const AtomicString&, HTMLFrameOwnerElement*) |
+RawPtr<LocalFrame> EmptyFrameLoaderClient::createFrame(const FrameLoadRequest&, const AtomicString&, HTMLFrameOwnerElement*) |
{ |
return nullptr; |
} |
-PassRefPtrWillBeRawPtr<Widget> EmptyFrameLoaderClient::createPlugin(HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool, DetachedPluginPolicy) |
+RawPtr<Widget> EmptyFrameLoaderClient::createPlugin(HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool, DetachedPluginPolicy) |
{ |
return nullptr; |
} |
@@ -162,7 +162,7 @@ PassOwnPtr<WebMediaSession> EmptyFrameLoaderClient::createWebMediaSession() |
return nullptr; |
} |
-void EmptyTextCheckerClient::requestCheckingOfString(PassRefPtrWillBeRawPtr<TextCheckingRequest>) |
+void EmptyTextCheckerClient::requestCheckingOfString(RawPtr<TextCheckingRequest>) |
{ |
} |