| Index: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h
|
| diff --git a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h
|
| index 227541be515c738c74ac6cae5ff628d15698b6d3..1cb373de7f44c2ed08f342fe6fc4577cbf104dbb 100644
|
| --- a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h
|
| +++ b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h
|
| @@ -55,9 +55,10 @@
|
| class ThreadableLoaderClient;
|
|
|
| class CORE_EXPORT DocumentThreadableLoader final : public ThreadableLoader, private RawResourceClient {
|
| + USING_FAST_MALLOC(DocumentThreadableLoader);
|
| public:
|
| static void loadResourceSynchronously(Document&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
| - static DocumentThreadableLoader* create(Document&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
| + static std::unique_ptr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
| ~DocumentThreadableLoader() override;
|
|
|
| void start(const ResourceRequest&) override;
|
| @@ -67,8 +68,6 @@
|
| // |this| may be dead after calling this method in async mode.
|
| void cancel() override;
|
| void setDefersLoading(bool);
|
| -
|
| - DECLARE_TRACE();
|
|
|
| private:
|
| enum BlockingBehavior {
|
| @@ -170,14 +169,14 @@
|
| m_resource->addClient(this);
|
| }
|
| }
|
| - Member<RawResource> m_resource;
|
| + Persistent<RawResource> m_resource;
|
| // End of ResourceOwner re-implementation, see above.
|
|
|
| SecurityOrigin* getSecurityOrigin() const;
|
| Document& document() const;
|
|
|
| ThreadableLoaderClient* m_client;
|
| - Member<Document> m_document;
|
| + WeakPersistent<Document> m_document;
|
|
|
| const ThreadableLoaderOptions m_options;
|
| // Some items may be overridden by m_forceDoNotAllowStoredCredentials
|
|
|