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 cd794c47e24a1157939bc37ad9e6d000e58a233d..71d0c94f1ad9da1c6a9b7fbcb29ff237dd4952b6 100644 |
--- a/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h |
+++ b/third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h |
@@ -53,7 +53,7 @@ class ResourceRequest; |
class SecurityOrigin; |
class ThreadableLoaderClient; |
-class CORE_EXPORT DocumentThreadableLoader final : public ThreadableLoader, private ResourceOwner<RawResource> { |
+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&); |
@@ -146,6 +146,31 @@ class CORE_EXPORT DocumentThreadableLoader final : public ThreadableLoader, priv |
// returns allowCredentials value of m_resourceLoaderOptions. |
StoredCredentials effectiveAllowCredentials() const; |
+ // TODO(oilpan): DocumentThreadableLoader used to be a ResourceOwner, |
+ // but ResourceOwner was moved onto the oilpan heap before |
+ // DocumentThreadableLoader was ready. When DocumentThreadableLoader |
haraken
2016/01/12 00:22:52
Just help me understand: In what sense is it not r
yhirano
2016/01/12 07:54:49
Making ThreadableLoader on-heap means making Worke
|
+ // moves onto the oilpan heap, make it a ResourceOwner again and remove |
+ // this re-implementation of ResourceOwner. |
+ RawResource* resource() const { return m_resource.get(); } |
+ void clearResource() { setResource(nullptr); } |
+ void setResource(const ResourcePtr<RawResource>& newResource) |
+ { |
+ if (newResource == m_resource) |
+ return; |
+ |
+ if (ResourcePtr<RawResource> oldResource = m_resource) { |
+ m_resource.clear(); |
+ oldResource->removeClient(this); |
+ } |
+ |
+ if (newResource) { |
+ m_resource = newResource; |
+ m_resource->addClient(this); |
+ } |
+ } |
+ ResourcePtr<RawResource> m_resource; |
+ // End of ResourceOwner re-implementation, see above. |
+ |
SecurityOrigin* securityOrigin() const; |
Document& document() const; |