[Loader] Make ThreadableLoader non-RefCounted and be managed by OwnPtr

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"
 #include "modules/fetch/CrossThreadHolder.h"
 #include "modules/fetch/DataConsumerHandleUtil.h"
 #include "platform/blob/BlobRegistry.h"
 #include "platform/blob/BlobURL.h"
 #include "platform/network/ResourceRequest.h"

[tyoshino (SeeGerritForStatus), 2016/03/03 11:53:38]

Add OwnPtr.h

[hiroshige, 2016/03/08 23:39:25]

Done.

 
 namespace blink {
 
 using Result = FetchBlobDataConsumerHandle::Result;
 
 namespace {
 
 // Object graph:
 //                                           +-------------+
 //                                           |ReaderContext|
@@ skipping 67 matching lines @@
         m_loader = createLoader(executionContext, this);
         ASSERT(m_loader);
 
         ResourceRequest request(url);
         request.setRequestContext(WebURLRequest::RequestContextInternal);
         request.setUseStreamOnResponse(true);
         m_loader->start(request);
     }
 
 private:
-    PassRefPtr<ThreadableLoader> createLoader(ExecutionContext* executionContext, ThreadableLoaderClient* client) const
+    PassOwnPtr<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 30 matching lines @@
     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;
-    RefPtr<ThreadableLoader> m_loader;
+    OwnPtr<ThreadableLoader> m_loader;
 
     bool m_receivedResponse;
 };
 
 class DefaultLoaderFactory final : public FetchBlobDataConsumerHandle::LoaderFactory {
 public:
-    PassRefPtr<ThreadableLoader> create(
+    PassOwnPtr<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 adoptPtr(new FetchBlobDataConsumerHandle(executionContext, blobDataHandle, new DefaultLoaderFactory));
 }
 
 FetchDataConsumerHandle::Reader* FetchBlobDataConsumerHandle::obtainReaderInternal(Client* client)
 {
     return m_readerContext->obtainReader(client).leakPtr();
 }
 
 } // namespace blink