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

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

Issue 1192913007: Change BodyStreamBuffer to be FetchDataConsumerHandle-based and enable backpressure in Fetch API (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Reflect comments. Created 5 years, 5 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
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"
11 #include "bindings/core/v8/V8Binding.h" 11 #include "bindings/core/v8/V8Binding.h"
12 #include "bindings/modules/v8/V8Response.h" 12 #include "bindings/modules/v8/V8Response.h"
13 #include "core/dom/ExceptionCode.h" 13 #include "core/dom/ExceptionCode.h"
14 #include "core/dom/ExecutionContext.h" 14 #include "core/dom/ExecutionContext.h"
15 #include "core/inspector/ConsoleMessage.h" 15 #include "core/inspector/ConsoleMessage.h"
16 #include "core/streams/Stream.h" 16 #include "core/streams/Stream.h"
17 #include "modules/fetch/BodyStreamBuffer.h" 17 #include "modules/fetch/BodyStreamBuffer.h"
18 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h" 18 #include "modules/serviceworkers/ServiceWorkerGlobalScopeClient.h"
19 #include "platform/RuntimeEnabledFeatures.h" 19 #include "platform/RuntimeEnabledFeatures.h"
20 #include "public/platform/WebServiceWorkerResponse.h" 20 #include "public/platform/WebServiceWorkerResponse.h"
21 #include "wtf/Assertions.h" 21 #include "wtf/Assertions.h"
22 #include "wtf/RefPtr.h" 22 #include "wtf/RefPtr.h"
23 #include <v8.h> 23 #include <v8.h>
24 24
25 namespace blink { 25 namespace blink {
26 namespace {
27
28 class StreamUploader : public BodyStreamBuffer::Observer {
29 public:
30 StreamUploader(BodyStreamBuffer* buffer, Stream* outStream)
31 : m_buffer(buffer), m_outStream(outStream)
32 {
33 }
34 ~StreamUploader() override { }
35 void onWrite() override
36 {
37 bool needToFlush = false;
38 while (RefPtr<DOMArrayBuffer> buf = m_buffer->read()) {
39 needToFlush = true;
40 m_outStream->addData(static_cast<const char*>(buf->data()), buf->byt eLength());
41 }
42 if (needToFlush)
43 m_outStream->flush();
44 }
45 void onClose() override
46 {
47 m_outStream->finalize();
48 cleanup();
49 }
50 void onError() override
51 {
52 // If the stream is aborted soon after the stream is registered to the
53 // StreamRegistry, ServiceWorkerURLRequestJob may not notice the error
54 // and continue waiting forever.
55 // FIXME: Add new message to report the error to the browser process.
56 m_outStream->abort();
57 cleanup();
58 }
59 DEFINE_INLINE_TRACE()
60 {
61 visitor->trace(m_buffer);
62 visitor->trace(m_outStream);
63 BodyStreamBuffer::Observer::trace(visitor);
64 }
65 void start()
66 {
67 m_buffer->registerObserver(this);
68 onWrite();
69 if (m_buffer->hasError())
70 return onError();
71 if (m_buffer->isClosed())
72 return onClose();
73 }
74
75 private:
76 void cleanup()
77 {
78 m_buffer->unregisterObserver();
79 m_buffer.clear();
80 m_outStream.clear();
81 }
82 Member<BodyStreamBuffer> m_buffer;
83 Member<Stream> m_outStream;
84 };
85
86 } // namespace
87 26
88 class RespondWithObserver::ThenFunction final : public ScriptFunction { 27 class RespondWithObserver::ThenFunction final : public ScriptFunction {
89 public: 28 public:
90 enum ResolveType { 29 enum ResolveType {
91 Fulfilled, 30 Fulfilled,
92 Rejected, 31 Rejected,
93 }; 32 };
94 33
95 static v8::Local<v8::Function> createFunction(ScriptState* scriptState, Resp ondWithObserver* observer, ResolveType type) 34 static v8::Local<v8::Function> createFunction(ScriptState* scriptState, Resp ondWithObserver* observer, ResolveType type)
96 { 35 {
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 || (m_requestMode != WebURLRequest::FetchRequestModeNoCORS && responseTy pe == FetchResponseData::OpaqueType) 137 || (m_requestMode != WebURLRequest::FetchRequestModeNoCORS && responseTy pe == FetchResponseData::OpaqueType)
199 || (m_frameType != WebURLRequest::FrameTypeNone && responseType != Fetch ResponseData::BasicType && responseType != FetchResponseData::DefaultType)) { 138 || (m_frameType != WebURLRequest::FrameTypeNone && responseType != Fetch ResponseData::BasicType && responseType != FetchResponseData::DefaultType)) {
200 responseWasRejected(); 139 responseWasRejected();
201 return; 140 return;
202 } 141 }
203 if (response->bodyUsed()) { 142 if (response->bodyUsed()) {
204 responseWasRejected(); 143 responseWasRejected();
205 return; 144 return;
206 } 145 }
207 response->lockBody(Body::PassBody); 146 response->lockBody(Body::PassBody);
208 if (BodyStreamBuffer* buffer = response->internalBuffer()) { 147 if (OwnPtr<DrainingBodyStreamBuffer> buffer = response->createInternalDraini ngStream()) {
209 if (buffer == response->buffer() && response->isBodyConsumed())
210 buffer = response->createDrainingStream();
211 WebServiceWorkerResponse webResponse; 148 WebServiceWorkerResponse webResponse;
212 response->populateWebServiceWorkerResponse(webResponse); 149 response->populateWebServiceWorkerResponse(webResponse);
150 if (RefPtr<BlobDataHandle> blobDataHandle = buffer->drainAsBlobDataHandl e(FetchDataConsumerHandle::Reader::AllowBlobWithInvalidSize)) {
151 webResponse.setBlobDataHandle(blobDataHandle);
152 ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleF etchEvent(m_eventID, webResponse);
153 m_state = Done;
154 return;
155 }
213 Stream* outStream = Stream::create(executionContext(), ""); 156 Stream* outStream = Stream::create(executionContext(), "");
214 webResponse.setStreamURL(outStream->url()); 157 webResponse.setStreamURL(outStream->url());
215 ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetch Event(m_eventID, webResponse); 158 ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetch Event(m_eventID, webResponse);
216 StreamUploader* uploader = new StreamUploader(buffer, outStream); 159 FetchDataLoader* loader = FetchDataLoader::createLoaderAsStream(outStrea m);
217 uploader->start(); 160 buffer->startLoading(loader, nullptr);
218 m_state = Done; 161 m_state = Done;
219 return; 162 return;
220 } 163 }
221 WebServiceWorkerResponse webResponse; 164 WebServiceWorkerResponse webResponse;
222 response->populateWebServiceWorkerResponse(webResponse); 165 response->populateWebServiceWorkerResponse(webResponse);
223 ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetchEven t(m_eventID, webResponse); 166 ServiceWorkerGlobalScopeClient::from(executionContext())->didHandleFetchEven t(m_eventID, webResponse);
224 m_state = Done; 167 m_state = Done;
225 } 168 }
226 169
227 RespondWithObserver::RespondWithObserver(ExecutionContext* context, int eventID, WebURLRequest::FetchRequestMode requestMode, WebURLRequest::FrameType frameType ) 170 RespondWithObserver::RespondWithObserver(ExecutionContext* context, int eventID, WebURLRequest::FetchRequestMode requestMode, WebURLRequest::FrameType frameType )
228 : ContextLifecycleObserver(context) 171 : ContextLifecycleObserver(context)
229 , m_eventID(eventID) 172 , m_eventID(eventID)
230 , m_requestMode(requestMode) 173 , m_requestMode(requestMode)
231 , m_frameType(frameType) 174 , m_frameType(frameType)
232 , m_state(Initial) 175 , m_state(Initial)
233 { 176 {
234 } 177 }
235 178
236 DEFINE_TRACE(RespondWithObserver) 179 DEFINE_TRACE(RespondWithObserver)
237 { 180 {
238 ContextLifecycleObserver::trace(visitor); 181 ContextLifecycleObserver::trace(visitor);
239 } 182 }
240 183
241 } // namespace blink 184 } // namespace blink
OLDNEW
« Source/modules/fetch/Response.h ('K') | « Source/modules/fetch/ResponseTest.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698