Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(14)

Side by Side Diff: Source/modules/serviceworkers/RespondWithObserver.cpp

Issue 1049983003: [Fetch] Body consume function should not set bodyUsed flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@stream-clone
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/modules/serviceworkers/Cache.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "modules/serviceworkers/RespondWithObserver.h" 6 #include "modules/serviceworkers/RespondWithObserver.h"
7 7
8 #include "bindings/core/v8/ScriptFunction.h" 8 #include "bindings/core/v8/ScriptFunction.h"
9 #include "bindings/core/v8/ScriptPromise.h" 9 #include "bindings/core/v8/ScriptPromise.h"
10 #include "bindings/core/v8/ScriptValue.h" 10 #include "bindings/core/v8/ScriptValue.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 if (responseType == FetchResponseData::OpaqueType && m_frameType != WebURLRe quest::FrameTypeNone) { 196 if (responseType == FetchResponseData::OpaqueType && m_frameType != WebURLRe quest::FrameTypeNone) {
197 responseWasRejected(); 197 responseWasRejected();
198 return; 198 return;
199 } 199 }
200 if (response->bodyUsed()) { 200 if (response->bodyUsed()) {
201 responseWasRejected(); 201 responseWasRejected();
202 return; 202 return;
203 } 203 }
204 response->lockBody(Body::PassBody); 204 response->lockBody(Body::PassBody);
205 if (BodyStreamBuffer* buffer = response->internalBuffer()) { 205 if (BodyStreamBuffer* buffer = response->internalBuffer()) {
206 if (buffer == response->buffer() && response->streamAccessed()) 206 if (buffer == response->buffer() && response->isBodyConsumed())
207 buffer = response->createDrainingStream(); 207 buffer = response->createDrainingStream();
208 WebServiceWorkerResponse webResponse; 208 WebServiceWorkerResponse webResponse;
209 response->populateWebServiceWorkerResponse(webResponse); 209 response->populateWebServiceWorkerResponse(webResponse);
210 RefPtrWillBeMember<Stream> outStream(Stream::create(executionContext(), "")); 210 RefPtrWillBeMember<Stream> outStream(Stream::create(executionContext(), ""));
211 webResponse.setStreamURL(outStream->url()); 211 webResponse.setStreamURL(outStream->url());
212 ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetch Event(m_eventID, webResponse); 212 ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetch Event(m_eventID, webResponse);
213 StreamUploader* uploader = new StreamUploader(buffer, outStream); 213 StreamUploader* uploader = new StreamUploader(buffer, outStream);
214 uploader->start(); 214 uploader->start();
215 m_state = Done; 215 m_state = Done;
216 return; 216 return;
(...skipping 12 matching lines...) Expand all
229 , m_state(Initial) 229 , m_state(Initial)
230 { 230 {
231 } 231 }
232 232
233 DEFINE_TRACE(RespondWithObserver) 233 DEFINE_TRACE(RespondWithObserver)
234 { 234 {
235 ContextLifecycleObserver::trace(visitor); 235 ContextLifecycleObserver::trace(visitor);
236 } 236 }
237 237
238 } // namespace blink 238 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/serviceworkers/Cache.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698