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

third_party/WebKit/Source/modules/cachestorage/Cache.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/cachestorage/Cache.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
@@ skipping 34 matching lines @@
 class CacheMatchCallbacks : public WebServiceWorkerCache::CacheMatchCallbacks {
     WTF_MAKE_NONCOPYABLE(CacheMatchCallbacks);
 public:
     explicit CacheMatchCallbacks(ScriptPromiseResolver* resolver)
         : m_resolver(resolver) { }
 
     void onSuccess(const WebServiceWorkerResponse& webResponse) override
     {
         if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
             return;
-        m_resolver->resolve(Response::create(m_resolver->getScriptState(), webResponse));
+        m_resolver->resolve(Response::create(m_resolver->getScriptState()->getExecutionContext(), webResponse));
         m_resolver.clear();
     }
 
     void onError(WebServiceWorkerCacheError reason) override
     {
         if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
             return;
         if (reason == WebServiceWorkerCacheErrorNotFound)
             m_resolver->resolve();
         else
@@ skipping 11 matching lines @@
 public:
     explicit CacheWithResponsesCallbacks(ScriptPromiseResolver* resolver)
         : m_resolver(resolver) { }
 
     void onSuccess(const WebVector<WebServiceWorkerResponse>& webResponses) override
     {
         if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
             return;
         HeapVector<Member<Response>> responses;
         for (size_t i = 0; i < webResponses.size(); ++i)
-            responses.append(Response::create(m_resolver->getScriptState(), webResponses[i]));
+            responses.append(Response::create(m_resolver->getScriptState()->getExecutionContext(), webResponses[i]));
         m_resolver->resolve(responses);
         m_resolver.clear();
     }
 
     void onError(WebServiceWorkerCacheError reason) override
     {
         if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
             return;
         m_resolver->reject(CacheStorageError::createException(reason));
         m_resolver.clear();
@@ skipping 39 matching lines @@
 public:
     explicit CacheWithRequestsCallbacks(ScriptPromiseResolver* resolver)
         : m_resolver(resolver) { }
 
     void onSuccess(const WebVector<WebServiceWorkerRequest>& webRequests) override
     {
         if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
             return;
         HeapVector<Member<Request>> requests;
         for (size_t i = 0; i < webRequests.size(); ++i)
-            requests.append(Request::create(m_resolver->getScriptState(), webRequests[i]));
+            requests.append(Request::create(m_resolver->getScriptState()->getExecutionContext(), webRequests[i]));
         m_resolver->resolve(requests);
         m_resolver.clear();
     }
 
     void onError(WebServiceWorkerCacheError reason) override
     {
         if (!m_resolver->getExecutionContext() || m_resolver->getExecutionContext()->activeDOMObjectsAreStopped())
             return;
         m_resolver->reject(CacheStorageError::createException(reason));
         m_resolver.clear();
@@ skipping 420 matching lines @@
         if (responses[i]->isBodyLocked() || responses[i]->bodyUsed()) {
             barrierCallback->onError("Response body is already used");
             return promise;
         }
 
         BodyStreamBuffer* buffer = responses[i]->internalBodyBuffer();
         if (buffer) {
             // If the response has body, read the all data and create
             // the blob handle and dispatch the put batch asynchronously.
             FetchDataLoader* loader = FetchDataLoader::createLoaderAsBlobHandle(responses[i]->internalMIMEType());
-            buffer->startLoading(loader, new BlobHandleCallbackForPut(i, barrierCallback, requests[i], responses[i]));
+            buffer->startLoading(scriptState->getExecutionContext(), loader, new BlobHandleCallbackForPut(i, barrierCallback, requests[i], responses[i]));
             continue;
         }
 
         WebServiceWorkerCache::BatchOperation batchOperation;
         batchOperation.operationType = WebServiceWorkerCache::OperationTypePut;
         requests[i]->populateWebServiceWorkerRequest(batchOperation.request);
         responses[i]->populateWebServiceWorkerResponse(batchOperation.response);
         barrierCallback->onSuccess(i, batchOperation);
     }
 
@@ skipping 19 matching lines @@
     m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, toWebQueryParams(options));
     return promise;
 }
 
 WebServiceWorkerCache* Cache::webCache() const
 {
     return m_webCache.get();
 }
 
 } // namespace blink