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: third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp

Issue 2303753003: [Fetch API] Start reading blob only when the reader wants to read contents. (Closed)
Patch Set: fix tests Created 4 years, 3 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "modules/fetch/FetchBlobDataConsumerHandle.h" 5 #include "modules/fetch/FetchBlobDataConsumerHandle.h"
6 6
7 #include "core/dom/ExecutionContext.h" 7 #include "core/dom/ExecutionContext.h"
8 #include "core/fetch/FetchInitiatorTypeNames.h" 8 #include "core/fetch/FetchInitiatorTypeNames.h"
9 #include "core/loader/ThreadableLoaderClient.h" 9 #include "core/loader/ThreadableLoaderClient.h"
10 #include "modules/fetch/CompositeDataConsumerHandle.h" 10 #include "modules/fetch/CompositeDataConsumerHandle.h"
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 ReaderImpl(Client* client, PassRefPtr<ReaderContext> readerContext, std: :unique_ptr<WebDataConsumerHandle::Reader> reader) 184 ReaderImpl(Client* client, PassRefPtr<ReaderContext> readerContext, std: :unique_ptr<WebDataConsumerHandle::Reader> reader)
185 : m_readerContext(readerContext) 185 : m_readerContext(readerContext)
186 , m_reader(std::move(reader)) 186 , m_reader(std::move(reader))
187 , m_notifier(client) { } 187 , m_notifier(client) { }
188 ~ReaderImpl() override { } 188 ~ReaderImpl() override { }
189 189
190 Result read(void* data, size_t size, Flags flags, size_t* readSize) over ride 190 Result read(void* data, size_t size, Flags flags, size_t* readSize) over ride
191 { 191 {
192 if (m_readerContext->drained()) 192 if (m_readerContext->drained())
193 return Done; 193 return Done;
194 m_readerContext->ensureStartLoader();
195 Result r = m_reader->read(data, size, flags, readSize); 194 Result r = m_reader->read(data, size, flags, readSize);
196 if (!(size == 0 && (r == Ok || r == ShouldWait))) { 195 if (!(size == 0 && (r == Ok || r == ShouldWait))) {
197 // We read non-empty data, so we cannot use the blob data 196 // We read non-empty data, so we cannot use the blob data
198 // handle which represents the whole data. 197 // handle which represents the whole data.
199 m_readerContext->clearBlobDataHandleForDrain(); 198 m_readerContext->clearBlobDataHandleForDrain();
199 m_readerContext->ensureStartLoader();
200 } 200 }
201 return r; 201 return r;
202 } 202 }
203 203
204 Result beginRead(const void** buffer, Flags flags, size_t* available) ov erride 204 Result beginRead(const void** buffer, Flags flags, size_t* available) ov erride
205 { 205 {
206 if (m_readerContext->drained()) 206 if (m_readerContext->drained())
207 return Done; 207 return Done;
208 m_readerContext->ensureStartLoader(); 208 m_readerContext->ensureStartLoader();
209 m_readerContext->clearBlobDataHandleForDrain(); 209 m_readerContext->clearBlobDataHandleForDrain();
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 307
308 return wrapUnique(new FetchBlobDataConsumerHandle(executionContext, blobData Handle, new DefaultLoaderFactory)); 308 return wrapUnique(new FetchBlobDataConsumerHandle(executionContext, blobData Handle, new DefaultLoaderFactory));
309 } 309 }
310 310
311 std::unique_ptr<FetchDataConsumerHandle::Reader> FetchBlobDataConsumerHandle::ob tainFetchDataReader(Client* client) 311 std::unique_ptr<FetchDataConsumerHandle::Reader> FetchBlobDataConsumerHandle::ob tainFetchDataReader(Client* client)
312 { 312 {
313 return m_readerContext->obtainReader(client); 313 return m_readerContext->obtainReader(client);
314 } 314 }
315 315
316 } // namespace blink 316 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698