BodyStreamBuffer's drainAs* function should lock stream

third_party/WebKit/Source/modules/fetch/BodyStreamBuffer.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/fetch/BodyStreamBuffer.h"
 
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMTypedArray.h"
 #include "core/dom/ExceptionCode.h"
 #include "modules/fetch/DataConsumerHandleUtil.h"
@@ skipping 64 matching lines @@
 
 BodyStreamBuffer::BodyStreamBuffer(PassOwnPtr<FetchDataConsumerHandle> handle)
     : m_handle(handle)
     , m_reader(m_handle->obtainReader(this))
     , m_stream(new ReadableByteStream(this, new ReadableByteStream::StrictStrategy))
     , m_streamNeedsMore(false)
 {
     m_stream->didSourceStart();
 }
 
-PassRefPtr<BlobDataHandle> BodyStreamBuffer::drainAsBlobDataHandle(FetchDataConsumerHandle::Reader::BlobSizePolicy policy)
+PassRefPtr<BlobDataHandle> BodyStreamBuffer::drainAsBlobDataHandle(ExecutionContext* executionContext, FetchDataConsumerHandle::Reader::BlobSizePolicy policy)
 {
     ASSERT(!isStreamLocked());
-    m_stream->setIsDisturbed();
+    ASSERT(!isStreamDisturbed());
     if (isStreamClosed() || isStreamErrored())
         return nullptr;
 
     RefPtr<BlobDataHandle> blobDataHandle = m_reader->drainAsBlobDataHandle(policy);
     if (blobDataHandle) {
+        NonThrowableExceptionState exceptionState;
+        m_stream->getBytesReader(executionContext, exceptionState);
+        m_stream->setIsDisturbed();
         close();
         return blobDataHandle.release();
     }
     return nullptr;
 }
 
-PassRefPtr<EncodedFormData> BodyStreamBuffer::drainAsFormData()
+PassRefPtr<EncodedFormData> BodyStreamBuffer::drainAsFormData(ExecutionContext* executionContext)
 {
     ASSERT(!isStreamLocked());
-    m_stream->setIsDisturbed();
+    ASSERT(!isStreamDisturbed());
     if (isStreamClosed() || isStreamErrored())
         return nullptr;
 
     RefPtr<EncodedFormData> formData = m_reader->drainAsFormData();
     if (formData) {
+        NonThrowableExceptionState exceptionState;
+        m_stream->getBytesReader(executionContext, exceptionState);
+        m_stream->setIsDisturbed();
         close();
         return formData.release();
     }
     return nullptr;
 }
 
 PassOwnPtr<FetchDataConsumerHandle> BodyStreamBuffer::releaseHandle(ExecutionContext* executionContext)
 {
     ASSERT(!isStreamLocked());
+    ASSERT(!isStreamDisturbed());
     m_reader = nullptr;
     m_stream->setIsDisturbed();
-    TrackExceptionState exceptionState;
+    NonThrowableExceptionState exceptionState;
     m_stream->getBytesReader(executionContext, exceptionState);
 
     if (isStreamClosed())
         return createFetchDataConsumerHandleFromWebHandle(createDoneDataConsumerHandle());
     if (isStreamErrored())
         return createFetchDataConsumerHandleFromWebHandle(createUnexpectedErrorDataConsumerHandle());
 
     ASSERT(m_handle);
     OwnPtr<FetchDataConsumerHandle> handle = m_handle.release();
     close();
@@ skipping 135 matching lines @@
 
 void BodyStreamBuffer::stopLoading()
 {
     if (!m_loader)
         return;
     m_loader->cancel();
     m_loader = nullptr;
 }
 
 } // namespace blink