Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(811)

Unified Diff: third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h

Issue 2228433002: Revert of Move ThreadableLoader to Oilpan heap (2/3) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@onheap-bridge-peer-in-worker-threadable-loader
Patch Set: Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698