Move ThreadableLoader to Oilpan heap (2/3)

third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/fetch/FetchBlobDataConsumerHandle.h"
 
 #include "core/dom/ExecutionContext.h"
 #include "core/fetch/FetchInitiatorTypeNames.h"
 #include "core/loader/ThreadableLoaderClient.h"
 #include "modules/fetch/CompositeDataConsumerHandle.h"
@@ skipping 58 matching lines @@
         , m_blobDataHandle(blobDataHandle)
         , m_loaderFactory(loaderFactory)
         , m_receivedResponse(false) { }
 
     ~BlobLoaderContext() override
     {
         if (m_loader && !m_receivedResponse)
             m_updater->update(createUnexpectedErrorDataConsumerHandle());
         if (m_loader) {
             m_loader->cancel();
-            m_loader.reset();
+            m_loader = nullptr;
         }
     }
 
     void start(ExecutionContext* executionContext) override
     {
         ASSERT(executionContext->isContextThread());
         ASSERT(!m_loader);
 
         KURL url = BlobURL::createPublicURL(executionContext->getSecurityOrigin());
         if (url.isEmpty()) {
             m_updater->update(createUnexpectedErrorDataConsumerHandle());
             return;
         }
         BlobRegistry::registerPublicBlobURL(executionContext->getSecurityOrigin(), url, m_blobDataHandle);
 
         m_loader = createLoader(executionContext, this);
         ASSERT(m_loader);
 
         ResourceRequest request(url);
         request.setRequestContext(WebURLRequest::RequestContextInternal);
         request.setUseStreamOnResponse(true);
         // We intentionally skip 'setExternalRequestStateFromRequestorAddressSpace', as 'data:' can never be external.
         m_loader->start(request);
     }
 
 private:
-    std::unique_ptr<ThreadableLoader> createLoader(ExecutionContext* executionContext, ThreadableLoaderClient* client) const
+    ThreadableLoader* createLoader(ExecutionContext* executionContext, ThreadableLoaderClient* client) const
     {
         ThreadableLoaderOptions options;
         options.preflightPolicy = ConsiderPreflight;
         options.crossOriginRequestPolicy = DenyCrossOriginRequests;
         options.contentSecurityPolicyEnforcement = DoNotEnforceContentSecurityPolicy;
         options.initiator = FetchInitiatorTypeNames::internal;
 
         ResourceLoaderOptions resourceLoaderOptions;
         resourceLoaderOptions.dataBufferingPolicy = DoNotBufferData;
 
@@ skipping 10 matching lines @@
             // |WebDataConsumerHandle| since we call
             // request.setUseStreamOnResponse().
             m_updater->update(createUnexpectedErrorDataConsumerHandle());
             return;
         }
         m_updater->update(std::move(handle));
     }
 
     void didFinishLoading(unsigned long, double) override
     {
-        m_loader.reset();
+        m_loader = nullptr;
     }
 
     void didFail(const ResourceError&) override
     {
         if (!m_receivedResponse)
             m_updater->update(createUnexpectedErrorDataConsumerHandle());
-        m_loader.reset();
+        m_loader = nullptr;
     }
 
     void didFailRedirectCheck() override
     {
         // We don't expect redirects for Blob loading.
         ASSERT_NOT_REACHED();
     }
 
     Persistent<CompositeDataConsumerHandle::Updater> m_updater;
 
     RefPtr<BlobDataHandle> m_blobDataHandle;
     Persistent<FetchBlobDataConsumerHandle::LoaderFactory> m_loaderFactory;
-    std::unique_ptr<ThreadableLoader> m_loader;
+    Persistent<ThreadableLoader> m_loader;
 
     bool m_receivedResponse;
 };
 
 class DefaultLoaderFactory final : public FetchBlobDataConsumerHandle::LoaderFactory {
 public:
-    std::unique_ptr<ThreadableLoader> create(
+    ThreadableLoader* create(
         ExecutionContext& executionContext,
         ThreadableLoaderClient* client,
         const ThreadableLoaderOptions& options,
         const ResourceLoaderOptions& resourceLoaderOptions) override
     {
         return ThreadableLoader::create(executionContext, client, options, resourceLoaderOptions);
     }
 };
 
 } // namespace
@@ skipping 132 matching lines @@
 
     return wrapUnique(new FetchBlobDataConsumerHandle(executionContext, blobDataHandle, new DefaultLoaderFactory));
 }
 
 std::unique_ptr<FetchDataConsumerHandle::Reader> FetchBlobDataConsumerHandle::obtainFetchDataReader(Client* client)
 {
     return m_readerContext->obtainReader(client);
 }
 
 } // namespace blink