Move ThreadableLoader to Oilpan heap (3/3)

third_party/WebKit/Source/core/loader/DocumentThreadableLoader.h

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2013, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 36 matching lines @@
 #include <memory>
 
 namespace blink {
 
 class Document;
 class KURL;
 class ResourceRequest;
 class SecurityOrigin;
 class ThreadableLoaderClient;
 
-class CORE_EXPORT DocumentThreadableLoader final : public ThreadableLoader, private RawResourceClient {

[haraken, 2016/07/29 15:00:44]

I'm just curious but is there any reason for the private inheritance?

[yhirano, 2016/08/01 08:52:38]

I don't know, and I don't like private inheritance, but I imagine that the
original author didn't want to allow an external user to handle
DocumentThreadableLoader as RawResourceClient / ResourceOwner.

+class CORE_EXPORT DocumentThreadableLoader final : public ThreadableLoader, private ResourceOwner<RawResource> {
+    USING_GARBAGE_COLLECTED_MIXIN(DocumentThreadableLoader);
     public:
         static void loadResourceSynchronously(Document&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
         static DocumentThreadableLoader* create(Document&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
         ~DocumentThreadableLoader() override;
 
         void start(const ResourceRequest&) override;
 
         void overrideTimeout(unsigned long timeout) override;
 
         // |this| may be dead after calling this method in async mode.
@@ skipping 75 matching lines @@
         // |this| may be dead after calling this method.
         void handleError(const ResourceError&);
 
         void loadRequest(const ResourceRequest&, ResourceLoaderOptions);
         bool isAllowedRedirect(const KURL&) const;
         // Returns DoNotAllowStoredCredentials
         // if m_forceDoNotAllowStoredCredentials is set. Otherwise, just
         // 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
-        // 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(RawResource* newResource)
-        {
-            if (newResource == m_resource)
-                return;
-
-            if (RawResource* oldResource = m_resource.release())
-                oldResource->removeClient(this);
-
-            if (newResource) {
-                m_resource = newResource;
-                m_resource->addClient(this);
-            }
-        }
-        Member<RawResource> m_resource;
-        // End of ResourceOwner re-implementation, see above.
-
         SecurityOrigin* getSecurityOrigin() const;
         Document& document() const;
 
         ThreadableLoaderClient* m_client;
         Member<Document> m_document;
 
         const ThreadableLoaderOptions m_options;
         // Some items may be overridden by m_forceDoNotAllowStoredCredentials
         // and m_securityOrigin. In such a case, build a ResourceLoaderOptions
         // with up-to-date values from them and this variable, and use it.
@@ skipping 45 matching lines @@
         // header when following the redirect.
         bool m_didRedirect;
         Referrer m_referrerAfterRedirect;
 
         WeakPtrFactory<DocumentThreadableLoader> m_weakFactory;
     };
 
 } // namespace blink
 
 #endif // DocumentThreadableLoader_h