Replace uses of {un}setPendingActivity() in FetchBodyStream.

Source/modules/serviceworkers/FetchBodyStream.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/serviceworkers/FetchBodyStream.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/fileapi/Blob.h"
 #include "core/fileapi/FileReaderLoader.h"
 #include "core/fileapi/FileReaderLoaderClient.h"
 #include "modules/serviceworkers/ResponseInit.h"
 #include "platform/NotImplemented.h"
 #include "public/platform/WebServiceWorkerResponse.h"
 
 namespace WebCore {
 
 PassRefPtrWillBeRawPtr<FetchBodyStream> FetchBodyStream::create(ExecutionContext* context, PassRefPtr<BlobDataHandle> blobDataHandle)
 {
-    RefPtrWillBeRawPtr<FetchBodyStream> fetchBodyStream(adoptRefWillBeRefCountedGarbageCollected(new FetchBodyStream(context, blobDataHandle)));
+    RefPtrWillBeRawPtr<FetchBodyStream> fetchBodyStream(adoptRefWillBeNoop(new FetchBodyStream(context, blobDataHandle)));
     fetchBodyStream->suspendIfNeeded();
     return fetchBodyStream.release();
 }
 
 ScriptPromise FetchBodyStream::readAsync(ScriptState* scriptState, ResponseType type)
 {
     if (m_hasRead)
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError("Already read", scriptState->isolate()));
 
     m_hasRead = true;
@@ skipping 17 matching lines @@
         // FIXME: Implement this.
         ASSERT_NOT_REACHED();
         break;
     case ResponseAsJSON:
     case ResponseAsText:
         break;
     default:
         ASSERT_NOT_REACHED();
     }
 
-    setPendingActivity(this);
     m_loader = adoptPtr(new FileReaderLoader(readType, this));
     m_loader->start(scriptState->executionContext(), m_blobDataHandle);
 
     return promise;
 }
 
 ScriptPromise FetchBodyStream::asArrayBuffer(ScriptState* scriptState)
 {
     return readAsync(scriptState, ResponseAsArrayBuffer);
 }
@@ skipping 18 matching lines @@
     return readAsync(scriptState, ResponseAsText);
 }
 
 void FetchBodyStream::stop()
 {
     // Canceling the load will call didFail which will remove the resolver.
     if (m_resolver)
         m_loader->cancel();
 }
 
+bool FetchBodyStream::hasPendingActivity() const
+{
+    return m_resolver;
+}
+
 FetchBodyStream::FetchBodyStream(ExecutionContext* context, PassRefPtr<BlobDataHandle> blobDataHandle)
     : ActiveDOMObject(context)
     , m_blobDataHandle(blobDataHandle)
     , m_hasRead(false)
 {
     ScriptWrappable::init(this);
 }
 
 void FetchBodyStream::resolveJSON()
 {
@@ skipping 32 matching lines @@
     case ResponseAsJSON:
         resolveJSON();
         break;
     case ResponseAsText:
         m_resolver->resolve(m_loader->stringResult());
         break;
     default:
         ASSERT_NOT_REACHED();
     }
     m_resolver.clear();
-    unsetPendingActivity(this);
-    return;
 }
 
 void FetchBodyStream::didFail(FileError::ErrorCode code)
 {
     ASSERT(m_resolver);
     m_resolver->resolve("");
     m_resolver.clear();
-    unsetPendingActivity(this);
 }
 
 } // namespace WebCore