Oilpan: fix build after r188851.

Source/modules/fetch/FetchManager.cpp

 // Copyright 2014 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 "config.h"
 #include "modules/fetch/FetchManager.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 12 matching lines @@
 #include "modules/fetch/ResponseInit.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceResponse.h"
 #include "platform/weborigin/SecurityOrigin.h"
 #include "public/platform/WebURLRequest.h"
 #include "wtf/HashSet.h"
 
 namespace blink {
 
-class FetchManager::Loader : public ThreadableLoaderClient, public ContextLifecycleObserver {
+class FetchManager::Loader final : public NoBaseWillBeGarbageCollectedFinalized<FetchManager::Loader>, public ThreadableLoaderClient, public ContextLifecycleObserver {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(FetchManager::Loader);
 public:
-    Loader(ExecutionContext*, FetchManager*, PassRefPtrWillBeRawPtr<ScriptPromiseResolver>, const FetchRequestData*);
+    static PassOwnPtrWillBeRawPtr<Loader> create(ExecutionContext* executionContext, FetchManager* fetchManager, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver, const FetchRequestData* request)
+    {
+        return adoptPtrWillBeNoop(new Loader(executionContext, fetchManager, resolver, request));
+    }
+
     ~Loader() override;
+    void trace(Visitor*) override;
+
     void didReceiveResponse(unsigned long, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) override;
     void didReceiveData(const char*, unsigned) override;
     void didFinishLoading(unsigned long, double) override;
     void didFail(const ResourceError&) override;
     void didFailAccessControlCheck(const ResourceError&) override;
     void didFailRedirectCheck() override;
 
     void start();
     void cleanup();
 
 private:
+    Loader(ExecutionContext*, FetchManager*, PassRefPtrWillBeRawPtr<ScriptPromiseResolver>, const FetchRequestData*);
+
     void performBasicFetch();
     void performNetworkError(const String& message);
     void performHTTPFetch(bool corsFlag, bool corsPreflightFlag);
     void failed(const String& message);
     void notifyFinished();
 
-    FetchManager* m_fetchManager;
-    RefPtrWillBePersistent<ScriptPromiseResolver> m_resolver;
-    Persistent<FetchRequestData> m_request;
-    Persistent<BodyStreamBuffer> m_responseBuffer;
+    RawPtrWillBeMember<FetchManager> m_fetchManager;
+    RefPtrWillBeMember<ScriptPromiseResolver> m_resolver;
+    PersistentWillBeMember<FetchRequestData> m_request;
+    PersistentWillBeMember<BodyStreamBuffer> m_responseBuffer;
     RefPtr<ThreadableLoader> m_loader;
     bool m_failed;
 };
 
 FetchManager::Loader::Loader(ExecutionContext* executionContext, FetchManager* fetchManager, PassRefPtrWillBeRawPtr<ScriptPromiseResolver> resolver, const FetchRequestData* request)
     : ContextLifecycleObserver(executionContext)
     , m_fetchManager(fetchManager)
     , m_resolver(resolver)
     , m_request(request->createCopy())
     , m_failed(false)
 {
 }
 
 FetchManager::Loader::~Loader()
 {
     if (m_loader)
         m_loader->cancel();
 }
 
+void FetchManager::Loader::trace(Visitor* visitor)
+{
+    visitor->trace(m_fetchManager);
+    visitor->trace(m_resolver);
+    visitor->trace(m_request);
+    visitor->trace(m_responseBuffer);
+    ContextLifecycleObserver::trace(visitor);
+}
+
 void FetchManager::Loader::didReceiveResponse(unsigned long, const ResourceResponse& response, PassOwnPtr<WebDataConsumerHandle> handle)
 {
     // FIXME: Use |handle|.
     ASSERT_UNUSED(handle, !handle);
     // Recompute the tainting if the request was redirected to a different
     // origin.
     if (!SecurityOrigin::create(response.url())->isSameSchemeHostPort(m_request->origin().get())) {
         switch (m_request->mode()) {
         case WebURLRequest::FetchRequestModeSameOrigin:
             ASSERT_NOT_REACHED();
@@ skipping 281 matching lines @@
 }
 
 FetchManager::FetchManager(ExecutionContext* executionContext)
     : m_executionContext(executionContext)
     , m_isStopped(false)
 {
 }
 
 FetchManager::~FetchManager()
 {
+#if !ENABLE(OILPAN)
     if (!m_isStopped)
         stop();
+#endif
 }
 
 ScriptPromise FetchManager::fetch(ScriptState* scriptState, const FetchRequestData* request)
 {
     RefPtrWillBeRawPtr<ScriptPromiseResolver> resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
-    OwnPtr<Loader> ownLoader(adoptPtr(new Loader(m_executionContext, this, resolver.release(), request)));
+    OwnPtrWillBeRawPtr<Loader> ownLoader = Loader::create(m_executionContext, this, resolver.release(), request);
     Loader* loader = m_loaders.add(ownLoader.release()).storedValue->get();
     loader->start();
     return promise;
 }
 
 void FetchManager::stop()
 {
     ASSERT(!m_isStopped);
     m_isStopped = true;
     for (auto& loader : m_loaders) {
         loader->cleanup();
     }
 }
 
 void FetchManager::onLoaderFinished(Loader* loader)
 {
     // We don't use remove here, becuase it may cause recursive deletion.
     OwnPtr<Loader> p = m_loaders.take(loader);
 }
 
 void FetchManager::trace(Visitor* visitor)
 {
+#if ENABLE(OILPAN)
     visitor->trace(m_executionContext);
+    visitor->trace(m_loaders);
+#endif
 }
 
 } // namespace blink