[Fetch API] Reflect spec changes of bodyUsed property

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 "config.h"
 #include "modules/cachestorage/Cache.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
@@ skipping 477 matching lines @@
     for (size_t i = 0; i < requests.size(); ++i) {
         KURL url(KURL(), requests[i]->url());
         if (!url.protocolIsInHTTPFamily()) {
             barrierCallback->onError("Request scheme '" + url.protocol() + "' is unsupported");
             return promise;
         }
         if (requests[i]->method() != "GET") {
             barrierCallback->onError("Request method '" + requests[i]->method() + "' is unsupported");
             return promise;
         }
-        if (requests[i]->hasBody() && requests[i]->bodyUsed()) {
-            barrierCallback->onError("Request body is already used");
-            return promise;
-        }
-        if (responses[i]->hasBody() && responses[i]->bodyUsed()) {
+        // We don't read |request[i]|'s body, so we don't check its
+        // availability.

[hiroshige, 2015/11/19 12:50:36]

The spec says we must not check the request's body's availability and thus we
follow the spec here, and the previous implementation was not spec-conformant,
right?
If so, stating the spec (not just "we" = Blink) doesn't check request's body in
the comment might be clearer.

[yhirano, 2015/11/19 13:19:03]

Done.

[yhirano, 2015/11/19 14:17:15]

Actually, a Request having 'GET' method must not have body and hence this check
always passes. Replaced the comment with an assertion.

+
+        if (responses[i]->bodyUsed() || responses[i]->isBodyLocked()) {
             barrierCallback->onError("Response body is already used");
             return promise;
         }
 
-        if (requests[i]->hasBody())
-            requests[i]->setBodyPassed();
-        if (responses[i]->hasBody())
-            responses[i]->setBodyPassed();
-
         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(scriptState->executionContext(), loader, new BlobHandleCallbackForPut(i, barrierCallback, requests[i], responses[i]));
             continue;
         }
 
         WebServiceWorkerCache::BatchOperation batchOperation;
@@ skipping 25 matching lines @@
     m_webCache->dispatchKeys(new CacheWithRequestsCallbacks(resolver), 0, toWebQueryParams(options));
     return promise;
 }
 
 WebServiceWorkerCache* Cache::webCache() const
 {
     return m_webCache.get();
 }
 
 } // namespace blink