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

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

Issue 1233573002: [Fetch API] Remove DrainingBuffer. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 4 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 | Annotate | Revision Log
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 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
52 errorMessage = errorMessage + "a Response whose \"bodyUsed\" is \"true\" cannot be used to respond to a request."; 52 errorMessage = errorMessage + "a Response whose \"bodyUsed\" is \"true\" cannot be used to respond to a request.";
53 break; 53 break;
54 case WebServiceWorkerResponseErrorUnknown: 54 case WebServiceWorkerResponseErrorUnknown:
55 default: 55 default:
56 errorMessage = errorMessage + "an unexpected error occurred."; 56 errorMessage = errorMessage + "an unexpected error occurred.";
57 break; 57 break;
58 } 58 }
59 return errorMessage; 59 return errorMessage;
60 } 60 }
61 61
62 class NoopLoaderClient final : public GarbageCollectedFinalized<NoopLoaderClient >, public FetchDataLoader::Client {
63 WTF_MAKE_NONCOPYABLE(NoopLoaderClient);
64 USING_GARBAGE_COLLECTED_MIXIN(NoopLoaderClient);
65 public:
66 NoopLoaderClient() = default;
67 void didFetchDataLoadedStream() override {}
68 void didFetchDataLoadFailed() override {}
69 DEFINE_INLINE_TRACE() { FetchDataLoader::Client::trace(visitor); }
70 };
71
62 } // namespace 72 } // namespace
63 73
64 class RespondWithObserver::ThenFunction final : public ScriptFunction { 74 class RespondWithObserver::ThenFunction final : public ScriptFunction {
65 public: 75 public:
66 enum ResolveType { 76 enum ResolveType {
67 Fulfilled, 77 Fulfilled,
68 Rejected, 78 Rejected,
69 }; 79 };
70 80
71 static v8::Local<v8::Function> createFunction(ScriptState* scriptState, Resp ondWithObserver* observer, ResolveType type) 81 static v8::Local<v8::Function> createFunction(ScriptState* scriptState, Resp ondWithObserver* observer, ResolveType type)
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 } 192 }
183 if (m_frameType != WebURLRequest::FrameTypeNone && responseType != FetchResp onseData::BasicType && responseType != FetchResponseData::DefaultType) { 193 if (m_frameType != WebURLRequest::FrameTypeNone && responseType != FetchResp onseData::BasicType && responseType != FetchResponseData::DefaultType) {
184 responseWasRejected(WebServiceWorkerResponseErrorResponseTypeNotBasicOrD efault); 194 responseWasRejected(WebServiceWorkerResponseErrorResponseTypeNotBasicOrD efault);
185 return; 195 return;
186 } 196 }
187 if (response->bodyUsed()) { 197 if (response->bodyUsed()) {
188 responseWasRejected(WebServiceWorkerResponseErrorBodyUsed); 198 responseWasRejected(WebServiceWorkerResponseErrorBodyUsed);
189 return; 199 return;
190 } 200 }
191 201
192 response->lockBody(Body::PassBody); 202 response->setBodyPassed();
193 if (OwnPtr<DrainingBodyStreamBuffer> buffer = response->createInternalDraini ngStream()) {
194 WebServiceWorkerResponse webResponse;
195 response->populateWebServiceWorkerResponse(webResponse);
196 if (RefPtr<BlobDataHandle> blobDataHandle = buffer->drainAsBlobDataHandl e(FetchDataConsumerHandle::Reader::AllowBlobWithInvalidSize)) {
197 webResponse.setBlobDataHandle(blobDataHandle);
198 ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleF etchEvent(m_eventID, webResponse);
199 m_state = Done;
200 return;
201 }
202 Stream* outStream = Stream::create(executionContext(), "");
203 webResponse.setStreamURL(outStream->url());
204 ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetch Event(m_eventID, webResponse);
205 FetchDataLoader* loader = FetchDataLoader::createLoaderAsStream(outStrea m);
206 buffer->startLoading(loader, nullptr);
207 m_state = Done;
208 return;
209 }
210 WebServiceWorkerResponse webResponse; 203 WebServiceWorkerResponse webResponse;
211 response->populateWebServiceWorkerResponse(webResponse); 204 response->populateWebServiceWorkerResponse(webResponse);
205 BodyStreamBuffer* buffer = response->internalBodyBuffer();
206 if (buffer->hasBody()) {
207 RefPtr<BlobDataHandle> blobDataHandle = buffer->drainAsBlobDataHandle(Fe tchDataConsumerHandle::Reader::AllowBlobWithInvalidSize);
208 if (blobDataHandle) {
209 webResponse.setBlobDataHandle(blobDataHandle);
210 } else {
211 Stream* outStream = Stream::create(executionContext(), "");
212 webResponse.setStreamURL(outStream->url());
213 buffer->startLoading(executionContext(), FetchDataLoader::createLoad erAsStream(outStream), new NoopLoaderClient);
214 }
215 }
212 ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetchEven t(m_eventID, webResponse); 216 ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetchEven t(m_eventID, webResponse);
213 m_state = Done; 217 m_state = Done;
214 } 218 }
215 219
216 RespondWithObserver::RespondWithObserver(ExecutionContext* context, int eventID, const KURL& requestURL, WebURLRequest::FetchRequestMode requestMode, WebURLRequ est::FrameType frameType) 220 RespondWithObserver::RespondWithObserver(ExecutionContext* context, int eventID, const KURL& requestURL, WebURLRequest::FetchRequestMode requestMode, WebURLRequ est::FrameType frameType)
217 : ContextLifecycleObserver(context) 221 : ContextLifecycleObserver(context)
218 , m_eventID(eventID) 222 , m_eventID(eventID)
219 , m_requestURL(requestURL) 223 , m_requestURL(requestURL)
220 , m_requestMode(requestMode) 224 , m_requestMode(requestMode)
221 , m_frameType(frameType) 225 , m_frameType(frameType)
222 , m_state(Initial) 226 , m_state(Initial)
223 { 227 {
224 } 228 }
225 229
226 DEFINE_TRACE(RespondWithObserver) 230 DEFINE_TRACE(RespondWithObserver)
227 { 231 {
228 ContextLifecycleObserver::trace(visitor); 232 ContextLifecycleObserver::trace(visitor);
229 } 233 }
230 234
231 } // namespace blink 235 } // namespace blink
OLDNEW
« no previous file with comments | « Source/modules/fetch/ResponseTest.cpp ('k') | Source/modules/serviceworkers/ServiceWorkerGlobalScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698