Revert of Make Response::body return v8-extra based stream behind flag

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

Index: third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.cpp b/third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.cpp
index 41b8bed419b5f8fd60379e751168440b7c254559..6a4c58ef396687d09d3aa7c1dbe51d797ec5c0b4 100644
--- a/third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.cpp
+++ b/third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.cpp
@@ -4,16 +4,10 @@
 
 #include "modules/fetch/BodyStreamBuffer.h"
 
-#include "bindings/core/v8/ScriptState.h"
-#include "bindings/core/v8/V8HiddenValue.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMTypedArray.h"
 #include "core/dom/ExceptionCode.h"
-#include "core/streams/ReadableStreamController.h"
-#include "core/streams/ReadableStreamOperations.h"
-#include "modules/fetch/Body.h"
 #include "modules/fetch/DataConsumerHandleUtil.h"
-#include "platform/RuntimeEnabledFeatures.h"
 #include "platform/blob/BlobData.h"
 #include "platform/network/EncodedFormData.h"
 
@@ -79,42 +73,16 @@
     Member<FetchDataLoader::Client> m_client;
 };
 
-BodyStreamBuffer::BodyStreamBuffer(ScriptState* scriptState, PassOwnPtr<FetchDataConsumerHandle> handle)
-    : UnderlyingSourceBase(scriptState)
-    , m_scriptState(scriptState)
-    , m_handle(handle)
+BodyStreamBuffer::BodyStreamBuffer(PassOwnPtr<FetchDataConsumerHandle> handle)
+    : m_handle(handle)
     , m_reader(m_handle->obtainReader(this))
-{
-    if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled()) {
-        ScriptState::Scope scope(scriptState);
-        v8::Local<v8::Value> bodyValue = toV8(this, scriptState);
-        ASSERT(!bodyValue.IsEmpty());
-        ASSERT(bodyValue->IsObject());
-        v8::Local<v8::Object> body = bodyValue.As<v8::Object>();
-
-        ScriptValue readableStream = ReadableStreamOperations::createReadableStream(
-            scriptState, this, ReadableStreamOperations::createCountQueuingStrategy(scriptState, 0));
-        V8HiddenValue::setHiddenValue(scriptState, body, V8HiddenValue::internalBodyStream(scriptState->isolate()), readableStream.v8Value());
-    } else {
-        m_stream = new ReadableByteStream(this, new ReadableByteStream::StrictStrategy);
-        m_stream->didSourceStart();
-    }
-}
-
-ScriptValue BodyStreamBuffer::stream()
-{
-    ScriptState::Scope scope(m_scriptState.get());
-    if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled()) {
-        v8::Local<v8::Value> bodyValue = toV8(this, m_scriptState.get());
-        ASSERT(!bodyValue.IsEmpty());
-        ASSERT(bodyValue->IsObject());
-        v8::Local<v8::Object> body = bodyValue.As<v8::Object>();
-        return ScriptValue(m_scriptState.get(), V8HiddenValue::getHiddenValue(m_scriptState.get(), body, V8HiddenValue::internalBodyStream(m_scriptState->isolate())));
-    }
-    return ScriptValue(m_scriptState.get(), toV8(m_stream, m_scriptState.get()));
-}
-
-PassRefPtr<BlobDataHandle> BodyStreamBuffer::drainAsBlobDataHandle(FetchDataConsumerHandle::Reader::BlobSizePolicy policy)
+    , m_stream(new ReadableByteStream(this, new ReadableByteStream::StrictStrategy))
+    , m_streamNeedsMore(false)
+{
+    m_stream->didSourceStart();
+}
+
+PassRefPtr<BlobDataHandle> BodyStreamBuffer::drainAsBlobDataHandle(ExecutionContext* executionContext, FetchDataConsumerHandle::Reader::BlobSizePolicy policy)
 {
     ASSERT(!isStreamLocked());
     ASSERT(!isStreamDisturbed());
@@ -123,14 +91,16 @@
 
     RefPtr<BlobDataHandle> blobDataHandle = m_reader->drainAsBlobDataHandle(policy);
     if (blobDataHandle) {
-        lockAndDisturb();
+        NonThrowableExceptionState exceptionState;
+        m_stream->getBytesReader(executionContext, exceptionState);
+        m_stream->setIsDisturbed();
         close();
         return blobDataHandle.release();
     }
     return nullptr;
 }
 
-PassRefPtr<EncodedFormData> BodyStreamBuffer::drainAsFormData()
+PassRefPtr<EncodedFormData> BodyStreamBuffer::drainAsFormData(ExecutionContext* executionContext)
 {
     ASSERT(!isStreamLocked());
     ASSERT(!isStreamDisturbed());
@@ -139,18 +109,23 @@
 
     RefPtr<EncodedFormData> formData = m_reader->drainAsFormData();
     if (formData) {
-        lockAndDisturb();
+        NonThrowableExceptionState exceptionState;
+        m_stream->getBytesReader(executionContext, exceptionState);
+        m_stream->setIsDisturbed();
         close();
         return formData.release();
     }
     return nullptr;
 }
 
-PassOwnPtr<FetchDataConsumerHandle> BodyStreamBuffer::releaseHandle()
+PassOwnPtr<FetchDataConsumerHandle> BodyStreamBuffer::releaseHandle(ExecutionContext* executionContext)
 {
     ASSERT(!isStreamLocked());
     ASSERT(!isStreamDisturbed());
-    lockAndDisturb();
+    m_reader = nullptr;
+    m_stream->setIsDisturbed();
+    NonThrowableExceptionState exceptionState;
+    m_stream->getBytesReader(executionContext, exceptionState);
 
     if (isStreamClosed())
         return createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle());
@@ -163,23 +138,17 @@
     return handle.release();
 }
 
-void BodyStreamBuffer::startLoading(FetchDataLoader* loader, FetchDataLoader::Client* client)
+void BodyStreamBuffer::startLoading(ExecutionContext* executionContext, FetchDataLoader* loader, FetchDataLoader::Client* client)
 {
     ASSERT(!m_loader);
-    ASSERT(m_scriptState->contextIsValid());
-    OwnPtr<FetchDataConsumerHandle> handle = releaseHandle();
+    OwnPtr<FetchDataConsumerHandle> handle = releaseHandle(executionContext);
     m_loader = loader;
-    loader->start(handle.get(), new LoaderClient(m_scriptState->getExecutionContext(), this, client));
+    loader->start(handle.get(), new LoaderClient(executionContext, this, client));
 }
 
 bool BodyStreamBuffer::hasPendingActivity() const
 {
-    if (m_loader)
-        return true;
-    if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled())
-        return UnderlyingSourceBase::hasPendingActivity();
-
-    return m_stream->stateInternal() == ReadableStream::Readable && m_stream->isLocked();
+    return m_loader || (isStreamLocked() && isStreamReadable());
 }
 
 void BodyStreamBuffer::stop()
@@ -197,23 +166,6 @@
 
 ScriptPromise BodyStreamBuffer::cancelSource(ScriptState* scriptState, ScriptValue)
 {
-    ASSERT(scriptState == m_scriptState.get());
-    close();
-    return ScriptPromise::castUndefined(scriptState);
-}
-
-ScriptPromise BodyStreamBuffer::pull(ScriptState* scriptState)
-{
-    ASSERT(!m_streamNeedsMore);
-    ASSERT(scriptState == m_scriptState.get());
-    m_streamNeedsMore = true;
-    processData();
-    return ScriptPromise::castUndefined(scriptState);
-}
-
-ScriptPromise BodyStreamBuffer::cancel(ScriptState* scriptState, ScriptValue reason)
-{
-    ASSERT(scriptState == m_scriptState.get());
     close();
     return ScriptPromise::castUndefined(scriptState);
 }
@@ -245,93 +197,43 @@
     processData();
 }
 
-bool BodyStreamBuffer::isStreamReadable()
-{
-    if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled()) {
-        ScriptState::Scope scope(m_scriptState.get());
-        return ReadableStreamOperations::isReadable(m_scriptState.get(), stream());
-    }
+bool BodyStreamBuffer::isStreamReadable() const
+{
     return m_stream->stateInternal() == ReadableStream::Readable;
 }
 
-bool BodyStreamBuffer::isStreamClosed()
-{
-    if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled()) {
-        ScriptState::Scope scope(m_scriptState.get());
-        return ReadableStreamOperations::isClosed(m_scriptState.get(), stream());
-    }
+bool BodyStreamBuffer::isStreamClosed() const
+{
     return m_stream->stateInternal() == ReadableStream::Closed;
 }
 
-bool BodyStreamBuffer::isStreamErrored()
-{
-    if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled()) {
-        ScriptState::Scope scope(m_scriptState.get());
-        return ReadableStreamOperations::isErrored(m_scriptState.get(), stream());
-    }
+bool BodyStreamBuffer::isStreamErrored() const
+{
     return m_stream->stateInternal() == ReadableStream::Errored;
 }
 
-bool BodyStreamBuffer::isStreamLocked()
-{
-    if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled()) {
-        ScriptState::Scope scope(m_scriptState.get());
-        return ReadableStreamOperations::isLocked(m_scriptState.get(), stream());
-    }
+bool BodyStreamBuffer::isStreamLocked() const
+{
     return m_stream->isLocked();
 }
 
-bool BodyStreamBuffer::isStreamDisturbed()
-{
-    if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled()) {
-        ScriptState::Scope scope(m_scriptState.get());
-        return ReadableStreamOperations::isDisturbed(m_scriptState.get(), stream());
-    }
+bool BodyStreamBuffer::isStreamDisturbed() const
+{
     return m_stream->isDisturbed();
 }
 
-void BodyStreamBuffer::setDisturbed()
-{
-    if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled()) {
-        ScriptState::Scope scope(m_scriptState.get());
-        ReadableStreamOperations::setDisturbed(m_scriptState.get(), stream());
-    } else {
-        m_stream->setIsDisturbed();
-    }
-}
-
-void BodyStreamBuffer::lockAndDisturb()
-{
-    if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled()) {
-        ScriptState::Scope scope(m_scriptState.get());
-        NonThrowableExceptionState exceptionState;
-        ReadableStreamOperations::getReader(m_scriptState.get(), stream(), exceptionState);
-        ReadableStreamOperations::setDisturbed(m_scriptState.get(), stream());
-    } else {
-        NonThrowableExceptionState exceptionState;
-        m_stream->getBytesReader(m_scriptState->getExecutionContext(), exceptionState);
-        m_stream->setIsDisturbed();
-    }
-}
-
 void BodyStreamBuffer::close()
 {
-    if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled())
-        controller()->close();
-    else
-        m_stream->close();
-    m_reader = nullptr;
-    m_handle = nullptr;
+    m_reader = nullptr;
+    m_stream->close();
+    m_handle.clear();
 }
 
 void BodyStreamBuffer::error()
 {
-    if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled())
-        controller()->error(DOMException::create(NetworkError, "network error"));
-    else
-        m_stream->error(DOMException::create(NetworkError, "network error"));
-    m_reader = nullptr;
-    m_handle = nullptr;
+    m_reader = nullptr;
+    m_stream->error(DOMException::create(NetworkError, "network error"));
+    m_handle.clear();
 }
 
 void BodyStreamBuffer::processData()
@@ -342,17 +244,11 @@
         size_t available;
         WebDataConsumerHandle::Result result = m_reader->beginRead(&buffer, WebDataConsumerHandle::FlagNone, &available);
         switch (result) {
-        case WebDataConsumerHandle::Ok: {
-            DOMUint8Array* array = DOMUint8Array::create(static_cast<const unsigned char*>(buffer), available);
-            if (RuntimeEnabledFeatures::responseBodyWithV8ExtraStreamEnabled()) {
-                controller()->enqueue(array);
-                m_streamNeedsMore = controller()->desiredSize() > 0;
-            } else {
-                m_streamNeedsMore = m_stream->enqueue(array);
-            }
+        case WebDataConsumerHandle::Ok:
+            m_streamNeedsMore = m_stream->enqueue(DOMUint8Array::create(static_cast<const unsigned char*>(buffer), available));
             m_reader->endRead(available);
             break;
-        }
+
         case WebDataConsumerHandle::Done:
             close();
             return;