[Fetch API] Reflect spec changes of bodyUsed property

third_party/WebKit/Source/modules/fetch/Body.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/Body.h"
 
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 89 matching lines @@
     }
 };
 
 } // namespace
 
 ScriptPromise Body::arrayBuffer(ScriptState* scriptState)
 {
     if (m_opaque)
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "The body is opaque."));
 
-    if (bodyUsed())
+    if (isBodyLocked() || bodyUsed())
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Already read"));
 
     // When the main thread sends a V8::TerminateExecution() signal to a worker
     // thread, any V8 API on the worker thread starts returning an empty
     // handle. This can happen in Body::readAsync. To avoid the situation, we
     // first check the ExecutionContext and return immediately if it's already
     // gone (which means that the V8::TerminateExecution() signal has been sent
     // to this worker thread).
     if (!scriptState->executionContext())
         return ScriptPromise();
 
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     if (bodyBuffer()) {
         bodyBuffer()->startLoading(scriptState->executionContext(), FetchDataLoader::createLoaderAsArrayBuffer(), new BodyArrayBufferConsumer(resolver));
     } else {
         resolver->resolve(DOMArrayBuffer::create(0u, 1));
     }
     return promise;
 }
 
 ScriptPromise Body::blob(ScriptState* scriptState)
 {
     if (m_opaque)
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "The body is opaque."));
 
-    if (bodyUsed())
+    if (isBodyLocked() || bodyUsed())
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Already read"));
 
     // See above comment.
     if (!scriptState->executionContext())
         return ScriptPromise();
 
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     if (bodyBuffer()) {
         bodyBuffer()->startLoading(scriptState->executionContext(), FetchDataLoader::createLoaderAsBlobHandle(mimeType()), new BodyBlobConsumer(resolver));
     } else {
         OwnPtr<BlobData> blobData = BlobData::create();
         blobData->setContentType(mimeType());
         resolver->resolve(Blob::create(BlobDataHandle::create(blobData.release(), 0)));
     }
     return promise;
 
 }
 
 ScriptPromise Body::json(ScriptState* scriptState)
 {
     if (m_opaque)
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "The body is opaque."));
 
-    if (bodyUsed())
+    if (isBodyLocked() || bodyUsed())
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Already read"));
 
     // See above comment.
     if (!scriptState->executionContext())
         return ScriptPromise();
 
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     if (bodyBuffer()) {
         bodyBuffer()->startLoading(scriptState->executionContext(), FetchDataLoader::createLoaderAsString(), new BodyJsonConsumer(resolver));
     } else {
         resolver->reject(V8ThrowException::createSyntaxError(scriptState->isolate(), "Unexpected end of input"));
     }
     return promise;
 }
 
 ScriptPromise Body::text(ScriptState* scriptState)
 {
     if (m_opaque)
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "The body is opaque."));
 
-    if (bodyUsed())
+    if (isBodyLocked() || bodyUsed())
         return ScriptPromise::reject(scriptState, V8ThrowException::createTypeError(scriptState->isolate(), "Already read"));
 
     // See above comment.
     if (!scriptState->executionContext())
         return ScriptPromise();
 
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
     if (bodyBuffer()) {
         bodyBuffer()->startLoading(scriptState->executionContext(), FetchDataLoader::createLoaderAsString(), new BodyTextConsumer(resolver));
     } else {
         resolver->resolve(String());
     }
     return promise;
 }
 
 ReadableByteStream* Body::body()
 {
     UseCounter::count(executionContext(), UseCounter::FetchBodyStream);

[tyoshino (SeeGerritForStatus), 2015/10/30 04:50:34]

This starts counting the calls from bodyUsed and isBodyLocked

[yhirano, 2015/10/30 06:00:57]

Done.

     return bodyBuffer() ? bodyBuffer()->stream() : nullptr;
 }
 
 bool Body::bodyUsed()
 {
-    return m_bodyPassed || (body() && body()->isLocked());
+    return body() && body()->isDisturbed();
+}
+
+bool Body::isBodyLocked()
+{
+    return body() && body()->isLocked();
 }
 
 bool Body::hasPendingActivity() const
 {
     if (executionContext()->activeDOMObjectsAreStopped())
         return false;
     if (!bodyBuffer())
         return false;
     return bodyBuffer()->hasPendingActivity();
 }
 
 Body::Body(ExecutionContext* context)
     : ActiveDOMObject(context)
-    , m_bodyPassed(false)
     , m_opaque(false)
 {
     suspendIfNeeded();
 }
 
 } // namespace blink