Index: third_party/WebKit/Source/core/loader/EmptyClients.h |
diff --git a/third_party/WebKit/Source/core/loader/EmptyClients.h b/third_party/WebKit/Source/core/loader/EmptyClients.h |
index d802e72286e9e4581911cf93a7ff0b49ba611343..0486d8af145aeacaef25e632afa31cbaddd67b9e 100644 |
--- a/third_party/WebKit/Source/core/loader/EmptyClients.h |
+++ b/third_party/WebKit/Source/core/loader/EmptyClients.h |
@@ -68,7 +68,7 @@ namespace blink { |
class CORE_EXPORT EmptyChromeClient : public ChromeClient { |
public: |
- static PassOwnPtrWillBeRawPtr<EmptyChromeClient> create() { return adoptPtrWillBeNoop(new EmptyChromeClient); } |
+ static RawPtr<EmptyChromeClient> create() { return adoptPtrWillBeNoop(new EmptyChromeClient); } |
~EmptyChromeClient() override {} |
void chromeDestroyed() override {} |
@@ -119,7 +119,7 @@ public: |
bool openJavaScriptPromptDelegate(LocalFrame*, const String&, const String&, String&) override { return false; } |
bool hasOpenedPopup() const override { return false; } |
- PassRefPtrWillBeRawPtr<PopupMenu> openPopupMenu(LocalFrame&, HTMLSelectElement&) override; |
+ RawPtr<PopupMenu> openPopupMenu(LocalFrame&, HTMLSelectElement&) override; |
DOMWindow* pagePopupWindowForTesting() const override { return nullptr; } |
void setStatusbarText(const String&) override {} |
@@ -144,8 +144,8 @@ public: |
void enumerateChosenDirectory(FileChooser*) override {} |
- PassOwnPtrWillBeRawPtr<ColorChooser> openColorChooser(LocalFrame*, ColorChooserClient*, const Color&) override; |
- PassRefPtrWillBeRawPtr<DateTimeChooser> openDateTimeChooser(DateTimeChooserClient*, const DateTimeChooserParameters&) override; |
+ RawPtr<ColorChooser> openColorChooser(LocalFrame*, ColorChooserClient*, const Color&) override; |
+ RawPtr<DateTimeChooser> openDateTimeChooser(DateTimeChooserClient*, const DateTimeChooserParameters&) override; |
void openTextDataListChooser(HTMLInputElement&) override; |
void openFileChooser(LocalFrame*, PassRefPtr<FileChooser>) override; |
@@ -162,7 +162,7 @@ public: |
void setTouchAction(TouchAction) override {} |
- void didAssociateFormControls(const WillBeHeapVector<RefPtrWillBeMember<Element>>&, LocalFrame*) override {} |
+ void didAssociateFormControls(const HeapVector<Member<Element>>&, LocalFrame*) override {} |
void annotatedRegionsChanged() override {} |
String acceptLanguages() override; |
@@ -175,9 +175,8 @@ public: |
class CORE_EXPORT EmptyFrameLoaderClient : public FrameLoaderClient { |
WTF_MAKE_NONCOPYABLE(EmptyFrameLoaderClient); |
- USING_FAST_MALLOC_WILL_BE_REMOVED(EmptyFrameLoaderClient); |
public: |
- static PassOwnPtrWillBeRawPtr<EmptyFrameLoaderClient> create() { return adoptPtrWillBeNoop(new EmptyFrameLoaderClient); } |
+ static RawPtr<EmptyFrameLoaderClient> create() { return adoptPtrWillBeNoop(new EmptyFrameLoaderClient); } |
~EmptyFrameLoaderClient() override {} |
bool hasWebView() const override { return true; } // mainly for assertions |
@@ -227,7 +226,7 @@ public: |
void loadURLExternally(const ResourceRequest&, NavigationPolicy, const String&, bool) override {} |
- PassRefPtrWillBeRawPtr<DocumentLoader> createDocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&) override; |
+ RawPtr<DocumentLoader> createDocumentLoader(LocalFrame*, const ResourceRequest&, const SubstituteData&) override; |
String userAgent() override { return ""; } |
@@ -243,8 +242,8 @@ public: |
void didDisplayContentWithCertificateErrors(const KURL&, const CString&, const WebURL& mainResourceUrl, const CString& mainResourceSecurityInfo) override {} |
void didRunContentWithCertificateErrors(const KURL&, const CString&, const WebURL& mainResourceUrl, const CString& mainResourceSecurityInfo) override {} |
void selectorMatchChanged(const Vector<String>&, const Vector<String>&) override {} |
- PassRefPtrWillBeRawPtr<LocalFrame> createFrame(const FrameLoadRequest&, const AtomicString&, HTMLFrameOwnerElement*) override; |
- PassRefPtrWillBeRawPtr<Widget> createPlugin(HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool, DetachedPluginPolicy) override; |
+ RawPtr<LocalFrame> createFrame(const FrameLoadRequest&, const AtomicString&, HTMLFrameOwnerElement*) override; |
+ RawPtr<Widget> createPlugin(HTMLPlugInElement*, const KURL&, const Vector<String>&, const Vector<String>&, const String&, bool, DetachedPluginPolicy) override; |
bool canCreatePluginWithoutRenderer(const String& mimeType) const override { return false; } |
PassOwnPtr<WebMediaPlayer> createWebMediaPlayer(HTMLMediaElement&, const WebURL&, WebMediaPlayerClient*) override; |
PassOwnPtr<WebMediaSession> createWebMediaSession() override; |
@@ -283,7 +282,7 @@ public: |
void checkSpellingOfString(const String&, int*, int*) override {} |
void checkGrammarOfString(const String&, Vector<GrammarDetail>&, int*, int*) override {} |
- void requestCheckingOfString(PassRefPtrWillBeRawPtr<TextCheckingRequest>) override; |
+ void requestCheckingOfString(RawPtr<TextCheckingRequest>) override; |
}; |
class EmptySpellCheckerClient : public SpellCheckerClient { |