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

third_party/WebKit/Source/modules/fetch/DataConsumerHandleTestUtil.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/DataConsumerHandleTestUtil.h"
 
 #include "bindings/core/v8/DOMWrapperWorld.h"
 #include "wtf/PtrUtil.h"
 #include <memory>
 
@@ skipping 74 matching lines @@
 
 void DataConsumerHandleTestUtil::ReplayingHandle::Context::add(const Command& command)
 {
     MutexLocker locker(m_mutex);
     m_commands.append(command);
 }
 
 void DataConsumerHandleTestUtil::ReplayingHandle::Context::attachReader(WebDataConsumerHandle::Client* client)
 {
     MutexLocker locker(m_mutex);
-    DCHECK(!m_readerThread);
+    DCHECK(!m_readerTaskRunner);
     DCHECK(!m_client);
-    m_readerThread = Platform::current()->currentThread();
+    m_readerTaskRunner = client->getTaskRunner()->clone();
     m_client = client;
 
     if (m_client && !(isEmpty() && m_result == ShouldWait))
         notify();
 }
 
 void DataConsumerHandleTestUtil::ReplayingHandle::Context::detachReader()
 {
     MutexLocker locker(m_mutex);
-    DCHECK(m_readerThread && m_readerThread->isCurrentThread());
-    m_readerThread = nullptr;
+    DCHECK(m_readerTaskRunner && m_readerTaskRunner->runsTasksOnCurrentThread());
+    m_readerTaskRunner = nullptr;
     m_client = nullptr;
     if (!m_isHandleAttached)
         m_detached->signal();
 }
 
 void DataConsumerHandleTestUtil::ReplayingHandle::Context::detachHandle()
 {
     MutexLocker locker(m_mutex);
     m_isHandleAttached = false;
-    if (!m_readerThread)
+    if (!m_readerTaskRunner)
         m_detached->signal();
 }
 
 WebDataConsumerHandle::Result DataConsumerHandleTestUtil::ReplayingHandle::Context::beginRead(const void** buffer, Flags, size_t* available)
 {
     MutexLocker locker(m_mutex);
     *buffer = nullptr;
     *available = 0;
     if (isEmpty())
         return m_result;
@@ skipping 27 matching lines @@
 
 WebDataConsumerHandle::Result DataConsumerHandleTestUtil::ReplayingHandle::Context::endRead(size_t readSize)
 {
     MutexLocker locker(m_mutex);
     consume(readSize);
     return Ok;
 }
 
 DataConsumerHandleTestUtil::ReplayingHandle::Context::Context()
     : m_offset(0)
-    , m_readerThread(nullptr)
+    , m_readerTaskRunner(nullptr)
     , m_client(nullptr)
     , m_result(ShouldWait)
     , m_isHandleAttached(true)
     , m_detached(wrapUnique(new WaitableEvent()))
 {
 }
 
 const DataConsumerHandleTestUtil::Command& DataConsumerHandleTestUtil::ReplayingHandle::Context::top()
 {
     DCHECK(!isEmpty());
@@ skipping 10 matching lines @@
         m_commands.removeFirst();
     } else {
         m_offset += size;
     }
 }
 
 void DataConsumerHandleTestUtil::ReplayingHandle::Context::notify()
 {
     if (!m_client)
         return;
-    DCHECK(m_readerThread);
-    m_readerThread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, crossThreadBind(&Context::notifyInternal, wrapPassRefPtr(this)));
+    DCHECK(m_readerTaskRunner);
+    m_readerTaskRunner->postTask(BLINK_FROM_HERE, crossThreadBind(&Context::notifyInternal, wrapPassRefPtr(this)));
 }
 
 void DataConsumerHandleTestUtil::ReplayingHandle::Context::notifyInternal()
 {
     {
         MutexLocker locker(m_mutex);
-        if (!m_client || !m_readerThread->isCurrentThread()) {
+        if (!m_client || !m_readerTaskRunner->runsTasksOnCurrentThread()) {
             // There is no client, or a new reader is attached.
             return;
         }
     }
     // The reading thread is the current thread.
     m_client->didGetReadable();
 }
 
 DataConsumerHandleTestUtil::ReplayingHandle::ReplayingHandle()
     : m_context(Context::create())
 {
 }
 
 DataConsumerHandleTestUtil::ReplayingHandle::~ReplayingHandle()
 {
     m_context->detachHandle();
 }
 
 std::unique_ptr<WebDataConsumerHandle::Reader> DataConsumerHandleTestUtil::ReplayingHandle::obtainReader(Client* client)
 {
     return WTF::wrapUnique(new ReaderImpl(m_context, client));
 }
 
 void DataConsumerHandleTestUtil::ReplayingHandle::add(const Command& command)
 {
     m_context->add(command);
 }
 
-DataConsumerHandleTestUtil::HandleReader::HandleReader(std::unique_ptr<WebDataConsumerHandle> handle, std::unique_ptr<OnFinishedReading> onFinishedReading)
-    : m_reader(handle->obtainReader(this))
+DataConsumerHandleTestUtil::HandleReader::HandleReader(std::unique_ptr<WebDataConsumerHandle> handle, std::unique_ptr<OnFinishedReading> onFinishedReading, std::unique_ptr<WebTaskRunner> readerTaskRunner)
+    : m_readerTaskRunner(std::move(readerTaskRunner))
+    , m_reader(handle->obtainReader(this))
     , m_onFinishedReading(std::move(onFinishedReading))
 {
 }
 
 void DataConsumerHandleTestUtil::HandleReader::didGetReadable()
 {
     WebDataConsumerHandle::Result r = WebDataConsumerHandle::UnexpectedError;
     char buffer[3];
     while (true) {
         size_t size;
         r = m_reader->read(buffer, sizeof(buffer), WebDataConsumerHandle::FlagNone, &size);
         if (r == WebDataConsumerHandle::ShouldWait)
             return;
         if (r != WebDataConsumerHandle::Ok)
             break;
         m_data.append(buffer, size);
     }
     std::unique_ptr<HandleReadResult> result = wrapUnique(new HandleReadResult(r, m_data));
     m_data.clear();
-    Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, WTF::bind(&HandleReader::runOnFinishedReading, WTF::unretained(this), passed(std::move(result))));
+    m_readerTaskRunner->postTask(BLINK_FROM_HERE, WTF::bind(&HandleReader::runOnFinishedReading, WTF::unretained(this), passed(std::move(result))));
     m_reader = nullptr;
 }
 
+WebTaskRunner* DataConsumerHandleTestUtil::HandleReader::getTaskRunner()
+{
+    return m_readerTaskRunner.get();
+}
+
 void DataConsumerHandleTestUtil::HandleReader::runOnFinishedReading(std::unique_ptr<HandleReadResult> result)
 {
     DCHECK(m_onFinishedReading);
     std::unique_ptr<OnFinishedReading> onFinishedReading(std::move(m_onFinishedReading));
     (*onFinishedReading)(std::move(result));
 }
 
-DataConsumerHandleTestUtil::HandleTwoPhaseReader::HandleTwoPhaseReader(std::unique_ptr<WebDataConsumerHandle> handle, std::unique_ptr<OnFinishedReading> onFinishedReading)
-    : m_reader(handle->obtainReader(this))
+DataConsumerHandleTestUtil::HandleTwoPhaseReader::HandleTwoPhaseReader(std::unique_ptr<WebDataConsumerHandle> handle, std::unique_ptr<OnFinishedReading> onFinishedReading, std::unique_ptr<WebTaskRunner> readerTaskRunner)
+    : m_readerTaskRunner(std::move(readerTaskRunner))
+    , m_reader(handle->obtainReader(this))
     , m_onFinishedReading(std::move(onFinishedReading))
 {
 }
 
 void DataConsumerHandleTestUtil::HandleTwoPhaseReader::didGetReadable()
 {
     WebDataConsumerHandle::Result r = WebDataConsumerHandle::UnexpectedError;
     while (true) {
         const void* buffer = nullptr;
         size_t size;
         r = m_reader->beginRead(&buffer, WebDataConsumerHandle::FlagNone, &size);
         if (r == WebDataConsumerHandle::ShouldWait)
             return;
         if (r != WebDataConsumerHandle::Ok)
             break;
         // Read smaller than available in order to test |endRead|.
         size_t readSize = std::min(size, std::max(size * 2 / 3, static_cast<size_t>(1)));
         m_data.append(static_cast<const char*>(buffer), readSize);
         m_reader->endRead(readSize);
     }
     std::unique_ptr<HandleReadResult> result = wrapUnique(new HandleReadResult(r, m_data));
     m_data.clear();
-    Platform::current()->currentThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, WTF::bind(&HandleTwoPhaseReader::runOnFinishedReading, WTF::unretained(this), passed(std::move(result))));
+    m_readerTaskRunner->postTask(BLINK_FROM_HERE, WTF::bind(&HandleTwoPhaseReader::runOnFinishedReading, WTF::unretained(this), passed(std::move(result))));
     m_reader = nullptr;
 }
 
+WebTaskRunner* DataConsumerHandleTestUtil::HandleTwoPhaseReader::getTaskRunner()
+{
+    return m_readerTaskRunner.get();
+}
+
 void DataConsumerHandleTestUtil::HandleTwoPhaseReader::runOnFinishedReading(std::unique_ptr<HandleReadResult> result)
 {
     DCHECK(m_onFinishedReading);
     std::unique_ptr<OnFinishedReading> onFinishedReading(std::move(m_onFinishedReading));
     (*onFinishedReading)(std::move(result));
 }
 
+std::unique_ptr<WebTaskRunner> getCurrentTaskRunner()
+{
+    return Platform::current()->currentThread()->getWebTaskRunner()->clone();

[haraken, 2016/07/28 09:19:30]

Do you need clone()?

[tzik, 2016/07/28 14:45:34]

This is no longer used. Let me remove it.

+}
+
 } // namespace blink