Streams: Remove isTerminating() calls

third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.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 "modules/fetch/BodyStreamBuffer.h"
 
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8HiddenValue.h"
-#include "bindings/core/v8/WorkerOrWorkletScriptController.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 "core/workers/WorkerGlobalScope.h"
 #include "modules/fetch/Body.h"
 #include "modules/fetch/BytesConsumerForDataConsumerHandle.h"
 #include "modules/fetch/DataConsumerHandleUtil.h"
 #include "modules/fetch/DataConsumerTee.h"
 #include "modules/fetch/ReadableStreamDataConsumerHandle.h"
 #include "platform/blob/BlobData.h"
 #include "platform/network/EncodedFormData.h"
 #include <memory>
 
 namespace blink {
 
-namespace {
-
-bool isTerminating(ScriptState* scriptState)
-{
-    ExecutionContext* executionContext = scriptState->getExecutionContext();
-    if (!executionContext)
-        return true;
-    if (!executionContext->isWorkerGlobalScope())
-        return false;
-    return toWorkerGlobalScope(executionContext)->scriptController()->isExecutionTerminating();
-}
-
-} // namespace
-
 class BodyStreamBuffer::LoaderClient final : public GarbageCollectedFinalized<LoaderClient>, public ActiveDOMObject, public FetchDataLoader::Client {
     WTF_MAKE_NONCOPYABLE(LoaderClient);
     USING_GARBAGE_COLLECTED_MIXIN(LoaderClient);
 public:
     LoaderClient(ExecutionContext* executionContext, BodyStreamBuffer* buffer, FetchDataLoader::Client* client)
         : ActiveDOMObject(executionContext)
         , m_buffer(buffer)
         , m_client(client)
     {
         suspendIfNeeded();
@@ skipping 47 matching lines @@
     Member<FetchDataLoader::Client> m_client;
 };
 
 BodyStreamBuffer::BodyStreamBuffer(ScriptState* scriptState, std::unique_ptr<FetchDataConsumerHandle> handle)
     : UnderlyingSourceBase(scriptState)
     , m_scriptState(scriptState)
     , m_handle(std::move(handle))
     , m_reader(m_handle->obtainFetchDataReader(this))
     , m_madeFromReadableStream(false)
 {
-    if (isTerminating(scriptState)) {
+    v8::Local<v8::Value> bodyValue = toV8(this, scriptState);
+    if (bodyValue.IsEmpty()) {
         m_reader = nullptr;
         m_handle = nullptr;
         return;
-    }
-    v8::Local<v8::Value> bodyValue = toV8(this, scriptState);
-    if (bodyValue.IsEmpty()) {
-        DCHECK(isTerminating(scriptState));
-        m_reader = nullptr;
-        m_handle = nullptr;
-        return;
     }
     DCHECK(bodyValue->IsObject());
     v8::Local<v8::Object> body = bodyValue.As<v8::Object>();
 
     ScriptValue readableStream = ReadableStreamOperations::createReadableStream(
         scriptState, this, ReadableStreamOperations::createCountQueuingStrategy(scriptState, 0));
-    if (isTerminating(scriptState)) {
-        m_reader = nullptr;
-        m_handle = nullptr;
-        return;
-    }
     V8HiddenValue::setHiddenValue(scriptState, body, V8HiddenValue::internalBodyStream(scriptState->isolate()), readableStream.v8Value());
 }
 
 BodyStreamBuffer::BodyStreamBuffer(ScriptState* scriptState, ScriptValue stream)
     : UnderlyingSourceBase(scriptState)
     , m_scriptState(scriptState)
     , m_madeFromReadableStream(true)
 {
     DCHECK(ReadableStreamOperations::isReadableStream(scriptState, stream));
-    if (isTerminating(scriptState))
+    v8::Local<v8::Value> bodyValue = toV8(this, scriptState);
+    if (bodyValue.IsEmpty())

[haraken, 2016/08/22 04:35:39]

I recently changed toV8 so that it never returns an empty handle. You don't need
to change it in this CL though. FYI.

[yhirano, 2016/08/22 06:22:13]

+1

[nhiroki, 2016/08/22 06:57:46]

Removed the empty checks in this CL.

         return;
-    v8::Local<v8::Value> bodyValue = toV8(this, scriptState);
-    if (bodyValue.IsEmpty()) {
-        DCHECK(isTerminating(scriptState));
-        return;
-    }
     DCHECK(bodyValue->IsObject());
     v8::Local<v8::Object> body = bodyValue.As<v8::Object>();
 
     V8HiddenValue::setHiddenValue(scriptState, body, V8HiddenValue::internalBodyStream(scriptState->isolate()), stream.v8Value());
 }
 
 ScriptValue BodyStreamBuffer::stream()
 {
     ScriptState::Scope scope(m_scriptState.get());
-    if (isTerminating(m_scriptState.get()))
+    v8::Local<v8::Value> bodyValue = toV8(this, m_scriptState.get());
+    if (bodyValue.IsEmpty())
         return ScriptValue();
-    v8::Local<v8::Value> bodyValue = toV8(this, m_scriptState.get());
-    if (bodyValue.IsEmpty()) {
-        DCHECK(isTerminating(m_scriptState.get()));
-        return ScriptValue();
-    }
     DCHECK(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())));
 }
 
 PassRefPtr<BlobDataHandle> BodyStreamBuffer::drainAsBlobDataHandle(FetchDataConsumerHandle::Reader::BlobSizePolicy policy)
 {
     ASSERT(!isStreamLocked());
     ASSERT(!isStreamDisturbed());
     if (isStreamClosed() || isStreamErrored())
@@ skipping 248 matching lines @@
         return createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle());
     }
     if (isErrored)
         return createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle());
 
     DCHECK(handle);
     return handle;
 }
 
 } // namespace blink