| 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 8ab11666fc2d1e0f2492de813058bcc27e6f4298..f87a40fb77318fb123b6384dd6a5aa852068dd23 100644
|
| --- a/third_party/WebKit/Source/core/loader/EmptyClients.h
|
| +++ b/third_party/WebKit/Source/core/loader/EmptyClients.h
|
| @@ -69,7 +69,7 @@ namespace blink {
|
|
|
| class CORE_EXPORT EmptyChromeClient : public ChromeClient {
|
| public:
|
| - static PassOwnPtrWillBeRawPtr<EmptyChromeClient> create() { return adoptPtrWillBeNoop(new EmptyChromeClient); }
|
| + static RawPtr<EmptyChromeClient> create() { return (new EmptyChromeClient); }
|
|
|
| ~EmptyChromeClient() override {}
|
| void chromeDestroyed() override {}
|
| @@ -120,7 +120,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 {}
|
| @@ -145,8 +145,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;
|
| @@ -163,7 +163,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;
|
| @@ -176,9 +176,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 (new EmptyFrameLoaderClient); }
|
| ~EmptyFrameLoaderClient() override {}
|
|
|
| bool hasWebView() const override { return true; } // mainly for assertions
|
| @@ -228,7 +227,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 ""; }
|
|
|
| @@ -244,8 +243,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&, WebMediaPlayer::LoadType, const WebURL&, WebMediaPlayerClient*) override;
|
| PassOwnPtr<WebMediaSession> createWebMediaSession() override;
|
| @@ -282,7 +281,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 {
|
|
|