| Index: third_party/WebKit/Source/modules/fetch/FetchResponseData.cpp
|
| diff --git a/third_party/WebKit/Source/modules/fetch/FetchResponseData.cpp b/third_party/WebKit/Source/modules/fetch/FetchResponseData.cpp
|
| index f39879e536c2fcd0ba82a13b9e51e1a700fdb9ed..567b3e5cd981722773a15aec18fb91140bd5a73f 100644
|
| --- a/third_party/WebKit/Source/modules/fetch/FetchResponseData.cpp
|
| +++ b/third_party/WebKit/Source/modules/fetch/FetchResponseData.cpp
|
| @@ -4,7 +4,6 @@
|
|
|
| #include "modules/fetch/FetchResponseData.h"
|
|
|
| -#include "bindings/core/v8/ScriptState.h"
|
| #include "core/dom/DOMArrayBuffer.h"
|
| #include "core/fetch/CrossOriginAccessControl.h"
|
| #include "core/fetch/FetchUtils.h"
|
| @@ -161,7 +160,7 @@
|
| return m_mimeType;
|
| }
|
|
|
| -FetchResponseData* FetchResponseData::clone(ScriptState* scriptState)
|
| +FetchResponseData* FetchResponseData::clone(ExecutionContext* executionContext)
|
| {
|
| FetchResponseData* newResponse = create();
|
| newResponse->m_type = m_type;
|
| @@ -183,7 +182,7 @@
|
| ASSERT(m_internalResponse);
|
| ASSERT(m_buffer == m_internalResponse->m_buffer);
|
| ASSERT(m_internalResponse->m_type == DefaultType);
|
| - newResponse->m_internalResponse = m_internalResponse->clone(scriptState);
|
| + newResponse->m_internalResponse = m_internalResponse->clone(executionContext);
|
| m_buffer = m_internalResponse->m_buffer;
|
| newResponse->m_buffer = newResponse->m_internalResponse->m_buffer;
|
| break;
|
| @@ -191,9 +190,9 @@
|
| ASSERT(!m_internalResponse);
|
| if (m_buffer) {
|
| OwnPtr<WebDataConsumerHandle> handle1, handle2;
|
| - DataConsumerTee::create(scriptState->getExecutionContext(), m_buffer->releaseHandle(), &handle1, &handle2);
|
| - m_buffer = new BodyStreamBuffer(scriptState, createFetchDataConsumerHandleFromWebHandle(handle1.release()));
|
| - newResponse->m_buffer = new BodyStreamBuffer(scriptState, createFetchDataConsumerHandleFromWebHandle(handle2.release()));
|
| + DataConsumerTee::create(executionContext, m_buffer->releaseHandle(executionContext), &handle1, &handle2);
|
| + m_buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle1.release()));
|
| + newResponse->m_buffer = new BodyStreamBuffer(createFetchDataConsumerHandleFromWebHandle(handle2.release()));
|
| }
|
| break;
|
| }
|
| @@ -206,7 +205,7 @@
|
| ASSERT(m_internalResponse);
|
| ASSERT(!m_buffer);
|
| ASSERT(m_internalResponse->m_type == DefaultType);
|
| - newResponse->m_internalResponse = m_internalResponse->clone(scriptState);
|
| + newResponse->m_internalResponse = m_internalResponse->clone(executionContext);
|
| break;
|
| }
|
| return newResponse;
|
|
|