Use per-frame TaskRunner instead of thread's default in DataConsumerHandle

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

 // Copyright 2015 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/FetchFormDataConsumerHandle.h"
 
 #include "modules/fetch/DataConsumerHandleUtil.h"
 #include "modules/fetch/FetchBlobDataConsumerHandle.h"
+#include "public/platform/WebTaskRunner.h"
 #include "wtf/PtrUtil.h"
 #include "wtf/ThreadingPrimitives.h"
 #include "wtf/Vector.h"
 #include "wtf/text/TextCodec.h"
 #include "wtf/text/TextEncoding.h"
 #include "wtf/text/WTFString.h"
 #include <memory>
 #include <utility>
 
 namespace blink {
@@ skipping 10 matching lines @@
     }
     return true;
 }
 
 } // namespace
 
 class FetchFormDataConsumerHandle::Context : public ThreadSafeRefCounted<Context> {
     WTF_MAKE_NONCOPYABLE(Context);
 public:
     virtual ~Context() {}
-    virtual std::unique_ptr<FetchDataConsumerHandle::Reader> obtainReader(Client*) = 0;
+    virtual std::unique_ptr<FetchDataConsumerHandle::Reader> obtainReader(Client*, std::unique_ptr<WebTaskRunner>) = 0;
 
 protected:
     explicit Context() {}
 };
 
 class FetchFormDataConsumerHandle::SimpleContext final : public Context {
     class ReaderImpl;
 public:
     static PassRefPtr<SimpleContext> create(const String& body) { return adoptRef(new SimpleContext(body)); }
     static PassRefPtr<SimpleContext> create(const void* data, size_t size) { return adoptRef(new SimpleContext(data, size)); }
     static PassRefPtr<SimpleContext> create(PassRefPtr<EncodedFormData> body) { return adoptRef(new SimpleContext(body)); }
 
-    std::unique_ptr<Reader> obtainReader(Client* client) override
+    std::unique_ptr<Reader> obtainReader(Client* client, std::unique_ptr<WebTaskRunner> readerTaskRunner) override
     {
         // For memory barrier.
         Mutex m;
         MutexLocker locker(m);
-        return ReaderImpl::create(this, client);
+        return ReaderImpl::create(this, client, std::move(readerTaskRunner));
     }
 
     PassRefPtr<BlobDataHandle> drainAsBlobDataHandle()
     {
         if (!m_formData)
             return nullptr;
         flatten();
         std::unique_ptr<BlobData> blobData = BlobData::create();
         blobData->appendBytes(m_flattenFormData.data(), m_flattenFormData.size());
         m_flattenFormData.clear();
@@ skipping 47 matching lines @@
         RELEASE_ASSERT(read <= m_flattenFormData.size() - m_flattenFormDataOffset);
         m_flattenFormDataOffset += read;
 
         return WebDataConsumerHandle::Ok;
     }
 
 private:
     class ReaderImpl final : public FetchDataConsumerHandle::Reader {
         WTF_MAKE_NONCOPYABLE(ReaderImpl);
     public:
-        static std::unique_ptr<ReaderImpl> create(PassRefPtr<SimpleContext> context, Client* client) { return wrapUnique(new ReaderImpl(context, client)); }
+        static std::unique_ptr<ReaderImpl> create(PassRefPtr<SimpleContext> context, Client* client, std::unique_ptr<WebTaskRunner> readerTaskRunner)
+        {
+            return wrapUnique(new ReaderImpl(context, client, std::move(readerTaskRunner)));
+        }
         Result read(void* data, size_t size, Flags flags, size_t* readSize) override
         {
             return m_context->read(data, size, flags, readSize);
         }
         Result beginRead(const void** buffer, Flags flags, size_t* available) override
         {
             return m_context->beginRead(buffer, flags, available);
         }
         Result endRead(size_t read) override
         {
             return m_context->endRead(read);
         }
         PassRefPtr<BlobDataHandle> drainAsBlobDataHandle(BlobSizePolicy) override
         {
             // A "simple" FormData always has a finite known size.
             return m_context->drainAsBlobDataHandle();
         }
         PassRefPtr<EncodedFormData> drainAsFormData() override
         {
             return m_context->drainFormData();
         }
 
     private:
-        ReaderImpl(PassRefPtr<SimpleContext> context, Client* client) : m_context(context), m_notifier(client) {}
+        ReaderImpl(PassRefPtr<SimpleContext> context, Client* client, std::unique_ptr<WebTaskRunner> readerTaskRunner)
+            : m_context(context)
+            , m_notifier(client, readerTaskRunner.get()) {}
 
         RefPtr<SimpleContext> m_context;
         NotifyOnReaderCreationHelper m_notifier;
     };
 
     explicit SimpleContext(const String& body)
         : m_formData(EncodedFormData::create(UTF8Encoding().encode(body, WTF::EntitiesForUnencodables)))
         , m_flattenFormDataOffset(0) {}
     SimpleContext(const void* data, size_t size) : m_formData(EncodedFormData::create(data, size)) , m_flattenFormDataOffset(0) {}
     explicit SimpleContext(PassRefPtr<EncodedFormData> body) : m_formData(body->deepCopy()) , m_flattenFormDataOffset(0) {}
@@ skipping 18 matching lines @@
 class FetchFormDataConsumerHandle::ComplexContext final : public Context {
     class ReaderImpl;
 public:
     static PassRefPtr<ComplexContext> create(ExecutionContext* executionContext,
         PassRefPtr<EncodedFormData> formData,
         FetchBlobDataConsumerHandle::LoaderFactory* factory)
     {
         return adoptRef(new ComplexContext(executionContext, formData, factory));
     }
 
-    std::unique_ptr<FetchFormDataConsumerHandle::Reader> obtainReader(Client* client) override
+    std::unique_ptr<FetchFormDataConsumerHandle::Reader> obtainReader(Client* client, std::unique_ptr<WebTaskRunner> readerTaskRunner) override
     {
         // For memory barrier.
         Mutex m;
         MutexLocker locker(m);
-        return ReaderImpl::create(this, client);
+        return ReaderImpl::create(this, client, std::move(readerTaskRunner));
     }
 
 private:
     class ReaderImpl final : public FetchDataConsumerHandle::Reader {
         WTF_MAKE_NONCOPYABLE(ReaderImpl);
     public:
-        static std::unique_ptr<ReaderImpl> create(PassRefPtr<ComplexContext> context, Client* client) { return wrapUnique(new ReaderImpl(context, client)); }
+        static std::unique_ptr<ReaderImpl> create(PassRefPtr<ComplexContext> context, Client* client, std::unique_ptr<WebTaskRunner> readerTaskRunner)
+        {
+            return wrapUnique(new ReaderImpl(context, client, std::move(readerTaskRunner)));
+        }
         Result read(void* data, size_t size, Flags flags, size_t* readSize) override
         {
             Result r = m_reader->read(data, size, flags, readSize);
             if (!(size == 0 && (r == Ok || r == ShouldWait))) {
                 m_context->drainFormData();
             }
             return r;
         }
         Result beginRead(const void** buffer, Flags flags, size_t* available) override
         {
@@ skipping 19 matching lines @@
                 // Drain blob from the underlying handle to mark data as read.
                 RefPtr<BlobDataHandle> handle = m_reader->drainAsBlobDataHandle(AllowBlobWithInvalidSize);
                 // Here we assume we can always get the valid handle. That is
                 // in fact not specified at FetchDataConsumerHandle level, but
                 // |m_context->m_handle| is a FetchBlobDataConsumerHandle.
                 ASSERT(handle);
             }
             return formData.release();
         }
     private:
-        ReaderImpl(PassRefPtr<ComplexContext> context, Client* client) : m_context(context), m_reader(m_context->m_handle->obtainFetchDataReader(client)) {}
+        ReaderImpl(PassRefPtr<ComplexContext> context, Client* client, std::unique_ptr<WebTaskRunner> readerTaskRunner)
+            : m_context(context)
+            , m_reader(m_context->m_handle->obtainFetchDataReader(client, std::move(readerTaskRunner))) {}
 
         RefPtr<ComplexContext> m_context;
         std::unique_ptr<FetchDataConsumerHandle::Reader> m_reader;
     };
 
     ComplexContext(ExecutionContext* executionContext, PassRefPtr<EncodedFormData> body, FetchBlobDataConsumerHandle::LoaderFactory* factory)
     {
         std::unique_ptr<BlobData> blobData = BlobData::create();
         for (const auto& element : body->elements()) {
             switch (element.m_type) {
@@ skipping 72 matching lines @@
     FetchBlobDataConsumerHandle::LoaderFactory* loaderFactory)
 {
     if (isSimple(body.get())) {
         m_context = SimpleContext::create(body);
     } else {
         m_context = ComplexContext::create(executionContext, body, loaderFactory);
     }
 }
 FetchFormDataConsumerHandle::~FetchFormDataConsumerHandle() {}
 
-std::unique_ptr<FetchDataConsumerHandle::Reader> FetchFormDataConsumerHandle::obtainFetchDataReader(Client* client)
+std::unique_ptr<FetchDataConsumerHandle::Reader> FetchFormDataConsumerHandle::obtainFetchDataReader(Client* client, std::unique_ptr<WebTaskRunner> readerTaskRunner)
 {
-    return m_context->obtainReader(client);
+    return m_context->obtainReader(client, std::move(readerTaskRunner));
 }
 
 } // namespace blink