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

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

Issue 2146453002: BodyStreamBuffer shouldn't run scripts when ActiveDOMObjects are stopped (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "modules/fetch/BodyStreamBuffer.h" 5 #include "modules/fetch/BodyStreamBuffer.h"
6 6
7 #include "bindings/core/v8/ScriptState.h" 7 #include "bindings/core/v8/ScriptState.h"
8 #include "bindings/core/v8/V8HiddenValue.h" 8 #include "bindings/core/v8/V8HiddenValue.h"
9 #include "bindings/core/v8/WorkerOrWorkletScriptController.h" 9 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
10 #include "core/dom/DOMArrayBuffer.h" 10 #include "core/dom/DOMArrayBuffer.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 267
268 ScriptPromise BodyStreamBuffer::cancel(ScriptState* scriptState, ScriptValue rea son) 268 ScriptPromise BodyStreamBuffer::cancel(ScriptState* scriptState, ScriptValue rea son)
269 { 269 {
270 ASSERT(scriptState == m_scriptState.get()); 270 ASSERT(scriptState == m_scriptState.get());
271 close(); 271 close();
272 return ScriptPromise::castUndefined(scriptState); 272 return ScriptPromise::castUndefined(scriptState);
273 } 273 }
274 274
275 void BodyStreamBuffer::didGetReadable() 275 void BodyStreamBuffer::didGetReadable()
276 { 276 {
277 if (!m_reader) 277 if (!m_reader || !getExecutionContext() || getExecutionContext()->activeDOMO bjectsAreStopped())
278 return; 278 return;
279 279
280 if (!m_streamNeedsMore) { 280 if (!m_streamNeedsMore) {
281 // Perform zero-length read to call close()/error() early. 281 // Perform zero-length read to call close()/error() early.
282 size_t readSize; 282 size_t readSize;
283 WebDataConsumerHandle::Result result = m_reader->read(nullptr, 0, WebDat aConsumerHandle::FlagNone, &readSize); 283 WebDataConsumerHandle::Result result = m_reader->read(nullptr, 0, WebDat aConsumerHandle::FlagNone, &readSize);
284 switch (result) { 284 switch (result) {
285 case WebDataConsumerHandle::Ok: 285 case WebDataConsumerHandle::Ok:
286 case WebDataConsumerHandle::ShouldWait: 286 case WebDataConsumerHandle::ShouldWait:
287 return; 287 return;
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 return createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumer Handle()); 480 return createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumer Handle());
481 } 481 }
482 if (isErrored) 482 if (isErrored)
483 return createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorD ataConsumerHandle()); 483 return createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorD ataConsumerHandle());
484 484
485 DCHECK(handle); 485 DCHECK(handle);
486 return handle; 486 return handle;
487 } 487 }
488 488
489 } // namespace blink 489 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698