| 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 27ad6a6838b21e7de01bcc37904071a3a43cf17d..c9ca1b567fb6b34fc5e0edccd27a14a6fa9f8f8f 100644
|
| --- a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h
|
| +++ b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h
|
| @@ -55,10 +55,9 @@ class SecurityOrigin;
|
| 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 std::unique_ptr<DocumentThreadableLoader> create(Document&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
| + static DocumentThreadableLoader* create(Document&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
| ~DocumentThreadableLoader() override;
|
|
|
| void start(const ResourceRequest&) override;
|
| @@ -69,6 +68,8 @@ class CORE_EXPORT DocumentThreadableLoader final : public ThreadableLoader, priv
|
| void cancel() override;
|
| void setDefersLoading(bool);
|
|
|
| + DECLARE_TRACE();
|
| +
|
| private:
|
| enum BlockingBehavior {
|
| LoadSynchronously,
|
| @@ -169,14 +170,14 @@ class CORE_EXPORT DocumentThreadableLoader final : public ThreadableLoader, priv
|
| m_resource->addClient(this);
|
| }
|
| }
|
| - Persistent<RawResource> m_resource;
|
| + Member<RawResource> m_resource;
|
| // End of ResourceOwner re-implementation, see above.
|
|
|
| SecurityOrigin* getSecurityOrigin() const;
|
| Document& document() const;
|
|
|
| ThreadableLoaderClient* m_client;
|
| - WeakPersistent<Document> m_document;
|
| + Member<Document> m_document;
|
|
|
| const ThreadableLoaderOptions m_options;
|
| // Some items may be overridden by m_forceDoNotAllowStoredCredentials
|
|
|