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

Side by Side Diff: third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp

Issue 2327583002: Reland of [Fetch API] Start reading blob only when the reader wants to read contents. (Closed)
Patch Set: 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
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 ReaderImpl(Client* client, PassRefPtr<ReaderContext> readerContext, std: :unique_ptr<WebDataConsumerHandle::Reader> reader) 187 ReaderImpl(Client* client, PassRefPtr<ReaderContext> readerContext, std: :unique_ptr<WebDataConsumerHandle::Reader> reader)
188 : m_readerContext(readerContext) 188 : m_readerContext(readerContext)
189 , m_reader(std::move(reader)) 189 , m_reader(std::move(reader))
190 , m_notifier(client) { } 190 , m_notifier(client) { }
191 ~ReaderImpl() override { } 191 ~ReaderImpl() override { }
192 192
193 Result read(void* data, size_t size, Flags flags, size_t* readSize) over ride 193 Result read(void* data, size_t size, Flags flags, size_t* readSize) over ride
194 { 194 {
195 if (m_readerContext->drained()) 195 if (m_readerContext->drained())
196 return Done; 196 return Done;
197 m_readerContext->ensureStartLoader();
198 Result r = m_reader->read(data, size, flags, readSize); 197 Result r = m_reader->read(data, size, flags, readSize);
199 if (!(size == 0 && (r == Ok || r == ShouldWait))) { 198 if (!(size == 0 && (r == Ok || r == ShouldWait))) {
200 // We read non-empty data, so we cannot use the blob data 199 // We read non-empty data, so we cannot use the blob data
201 // handle which represents the whole data. 200 // handle which represents the whole data.
202 m_readerContext->clearBlobDataHandleForDrain(); 201 m_readerContext->clearBlobDataHandleForDrain();
202 m_readerContext->ensureStartLoader();
203 } 203 }
204 return r; 204 return r;
205 } 205 }
206 206
207 Result beginRead(const void** buffer, Flags flags, size_t* available) ov erride 207 Result beginRead(const void** buffer, Flags flags, size_t* available) ov erride
208 { 208 {
209 if (m_readerContext->drained()) 209 if (m_readerContext->drained())
210 return Done; 210 return Done;
211 m_readerContext->ensureStartLoader(); 211 m_readerContext->ensureStartLoader();
212 m_readerContext->clearBlobDataHandleForDrain(); 212 m_readerContext->clearBlobDataHandleForDrain();
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
310 310
311 return wrapUnique(new FetchBlobDataConsumerHandle(executionContext, std::mov e(blobDataHandle), new DefaultLoaderFactory)); 311 return wrapUnique(new FetchBlobDataConsumerHandle(executionContext, std::mov e(blobDataHandle), new DefaultLoaderFactory));
312 } 312 }
313 313
314 std::unique_ptr<FetchDataConsumerHandle::Reader> FetchBlobDataConsumerHandle::ob tainFetchDataReader(Client* client) 314 std::unique_ptr<FetchDataConsumerHandle::Reader> FetchBlobDataConsumerHandle::ob tainFetchDataReader(Client* client)
315 { 315 {
316 return m_readerContext->obtainReader(client); 316 return m_readerContext->obtainReader(client);
317 } 317 }
318 318
319 } // namespace blink 319 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandleTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698