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

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

Powered by Google App Engine
This is Rietveld 408576698