| Index: third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp
|
| diff --git a/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp b/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp
|
| index 5db39ffe8e3d59fbb93810e9cc8ef3e17d92d972..cc352a646bdcb1ba5d4d27be3d95909d66c34790 100644
|
| --- a/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp
|
| +++ b/third_party/WebKit/Source/modules/fetch/FetchBlobDataConsumerHandle.cpp
|
| @@ -13,6 +13,7 @@
|
| #include "platform/blob/BlobRegistry.h"
|
| #include "platform/blob/BlobURL.h"
|
| #include "platform/network/ResourceRequest.h"
|
| +#include "public/platform/WebTaskRunner.h"
|
| #include "wtf/PtrUtil.h"
|
| #include <memory>
|
|
|
| @@ -181,10 +182,10 @@ class FetchBlobDataConsumerHandle::ReaderContext final : public ThreadSafeRefCou
|
| public:
|
| class ReaderImpl : public FetchDataConsumerHandle::Reader {
|
| public:
|
| - ReaderImpl(Client* client, PassRefPtr<ReaderContext> readerContext, std::unique_ptr<WebDataConsumerHandle::Reader> reader)
|
| + ReaderImpl(Client* client, PassRefPtr<ReaderContext> readerContext, std::unique_ptr<WebDataConsumerHandle::Reader> reader, std::unique_ptr<WebTaskRunner> readerTaskRunner)
|
| : m_readerContext(readerContext)
|
| , m_reader(std::move(reader))
|
| - , m_notifier(client) { }
|
| + , m_notifier(client, readerTaskRunner.get()) { }
|
| ~ReaderImpl() override { }
|
|
|
| Result read(void* data, size_t size, Flags flags, size_t* readSize) override
|
| @@ -253,9 +254,9 @@ public:
|
| m_loaderContextHolder = CrossThreadHolder<LoaderContext>::create(executionContext, wrapUnique(new BlobLoaderContext(updater, m_blobDataHandleForDrain, loaderFactory)));
|
| }
|
|
|
| - std::unique_ptr<FetchDataConsumerHandle::Reader> obtainReader(WebDataConsumerHandle::Client* client)
|
| + std::unique_ptr<FetchDataConsumerHandle::Reader> obtainReader(WebDataConsumerHandle::Client* client, std::unique_ptr<WebTaskRunner> readerTaskRunner)
|
| {
|
| - return wrapUnique(new ReaderImpl(client, this, m_handle->obtainReader(client)));
|
| + return wrapUnique(new ReaderImpl(client, this, m_handle->obtainReader(client, readerTaskRunner->clone()), readerTaskRunner->clone()));
|
| }
|
|
|
| private:
|
| @@ -308,9 +309,9 @@ std::unique_ptr<FetchDataConsumerHandle> FetchBlobDataConsumerHandle::create(Exe
|
| return wrapUnique(new FetchBlobDataConsumerHandle(executionContext, blobDataHandle, new DefaultLoaderFactory));
|
| }
|
|
|
| -std::unique_ptr<FetchDataConsumerHandle::Reader> FetchBlobDataConsumerHandle::obtainFetchDataReader(Client* client)
|
| +std::unique_ptr<FetchDataConsumerHandle::Reader> FetchBlobDataConsumerHandle::obtainFetchDataReader(Client* client, std::unique_ptr<WebTaskRunner> readerTaskRunner)
|
| {
|
| - return m_readerContext->obtainReader(client);
|
| + return m_readerContext->obtainReader(client, std::move(readerTaskRunner));
|
| }
|
|
|
| } // namespace blink
|
|
|