Revert of Move ScriptState::GetExecutionContext (Part 5)

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 "modules/fetch/Body.h"
 
 #include <memory>
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "bindings/core/v8/V8ArrayBuffer.h"
 #include "bindings/core/v8/V8ThrowException.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMTypedArray.h"
-#include "core/dom/ExecutionContext.h"
 #include "core/fileapi/Blob.h"
 #include "modules/fetch/BodyStreamBuffer.h"
 #include "modules/fetch/FetchDataLoader.h"
 #include "platform/wtf/PassRefPtr.h"
 #include "platform/wtf/RefPtr.h"
 #include "public/platform/WebDataConsumerHandle.h"
 
 namespace blink {
 
 namespace {
@@ skipping 88 matching lines @@
   ScriptPromise promise = RejectInvalidConsumption(script_state);
   if (!promise.IsEmpty())
     return promise;
 
   // 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 this function. 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 (!ExecutionContext::From(script_state))
+  if (!script_state->GetExecutionContext())
     return ScriptPromise();
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   promise = resolver->Promise();
   if (BodyBuffer()) {
     BodyBuffer()->StartLoading(FetchDataLoader::CreateLoaderAsArrayBuffer(),
                                new BodyArrayBufferConsumer(resolver));
   } else {
     resolver->Resolve(DOMArrayBuffer::Create(0u, 1));
   }
   return promise;
 }
 
 ScriptPromise Body::blob(ScriptState* script_state) {
   ScriptPromise promise = RejectInvalidConsumption(script_state);
   if (!promise.IsEmpty())
     return promise;
 
   // See above comment.
-  if (!ExecutionContext::From(script_state))
+  if (!script_state->GetExecutionContext())
     return ScriptPromise();
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   promise = resolver->Promise();
   if (BodyBuffer()) {
     BodyBuffer()->StartLoading(
         FetchDataLoader::CreateLoaderAsBlobHandle(MimeType()),
         new BodyBlobConsumer(resolver));
   } else {
     std::unique_ptr<BlobData> blob_data = BlobData::Create();
     blob_data->SetContentType(MimeType());
     resolver->Resolve(
         Blob::Create(BlobDataHandle::Create(std::move(blob_data), 0)));
   }
   return promise;
 }
 
 ScriptPromise Body::json(ScriptState* script_state) {
   ScriptPromise promise = RejectInvalidConsumption(script_state);
   if (!promise.IsEmpty())
     return promise;
 
   // See above comment.
-  if (!ExecutionContext::From(script_state))
+  if (!script_state->GetExecutionContext())
     return ScriptPromise();
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   promise = resolver->Promise();
   if (BodyBuffer()) {
     BodyBuffer()->StartLoading(FetchDataLoader::CreateLoaderAsString(),
                                new BodyJsonConsumer(resolver));
   } else {
     resolver->Reject(V8ThrowException::CreateSyntaxError(
         script_state->GetIsolate(), "Unexpected end of input"));
   }
   return promise;
 }
 
 ScriptPromise Body::text(ScriptState* script_state) {
   ScriptPromise promise = RejectInvalidConsumption(script_state);
   if (!promise.IsEmpty())
     return promise;
 
   // See above comment.
-  if (!ExecutionContext::From(script_state))
+  if (!script_state->GetExecutionContext())
     return ScriptPromise();
 
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::Create(script_state);
   promise = resolver->Promise();
   if (BodyBuffer()) {
     BodyBuffer()->StartLoading(FetchDataLoader::CreateLoaderAsString(),
                                new BodyTextConsumer(resolver));
   } else {
     resolver->Resolve(String());
   }
@@ skipping 28 matching lines @@
 
 ScriptPromise Body::RejectInvalidConsumption(ScriptState* script_state) {
   if (IsBodyLocked() || bodyUsed())
     return ScriptPromise::Reject(
         script_state, V8ThrowException::CreateTypeError(
                           script_state->GetIsolate(), "Already read"));
   return ScriptPromise();
 }
 
 }  // namespace blink