<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[168611] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/168611">168611</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-05-12 00:04:59 -0700 (Mon, 12 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up MainThreadTask
https://bugs.webkit.org/show_bug.cgi?id=132799
Reviewed by Darin Adler.
Only have one simple MainThreadTask class that derives from std::function<void ()>.
Its templated constructor takes in the method and a variadic pack of parameters.
The cross-thread copies of the parameter are then bound to the given method through
std::bind(), with the resulting bind expression used to initialize the base
std::function<void ()> class.
The WebCore::callOnMainThread() functions and the helper classes are removed in favor
of passing MainThreadTask rvalues directly to WTF::callOnMainThread().
* fileapi/AsyncFileStream.cpp:
(WebCore::AsyncFileStream::startOnFileThread):
(WebCore::AsyncFileStream::stopOnFileThread):
(WebCore::AsyncFileStream::getSizeOnFileThread):
(WebCore::AsyncFileStream::openForReadOnFileThread):
(WebCore::AsyncFileStream::openForWriteOnFileThread):
(WebCore::AsyncFileStream::readOnFileThread):
(WebCore::AsyncFileStream::writeOnFileThread):
(WebCore::AsyncFileStream::truncateOnFileThread):
* platform/MainThreadTask.h:
(WebCore::MainThreadTask::MainThreadTask):
(WebCore::MainThreadTaskBase::MainThreadTaskBase): Deleted.
(WebCore::MainThreadTaskBase::~MainThreadTaskBase): Deleted.
(WebCore::MainThreadTask1::create): Deleted.
(WebCore::MainThreadTask1::MainThreadTask1): Deleted.
(WebCore::MainThreadTask2::create): Deleted.
(WebCore::MainThreadTask2::MainThreadTask2): Deleted.
(WebCore::MainThreadTask3::create): Deleted.
(WebCore::MainThreadTask3::MainThreadTask3): Deleted.
(WebCore::MainThreadTask4::create): Deleted.
(WebCore::MainThreadTask4::MainThreadTask4): Deleted.
(WebCore::MainThreadTask5::create): Deleted.
(WebCore::MainThreadTask5::MainThreadTask5): Deleted.
(WebCore::MainThreadTask6::create): Deleted.
(WebCore::MainThreadTask6::MainThreadTask6): Deleted.
(WebCore::MainThreadTask7::create): Deleted.
(WebCore::MainThreadTask7::MainThreadTask7): Deleted.
(WebCore::MainThreadTask8::create): Deleted.
(WebCore::MainThreadTask8::MainThreadTask8): Deleted.
(WebCore::executeMainThreadTask): Deleted.
(WebCore::callOnMainThread): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorefileapiAsyncFileStreamcpp">trunk/Source/WebCore/fileapi/AsyncFileStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformMainThreadTaskh">trunk/Source/WebCore/platform/MainThreadTask.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (168610 => 168611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-12 07:01:24 UTC (rev 168610)
+++ trunk/Source/WebCore/ChangeLog 2014-05-12 07:04:59 UTC (rev 168611)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2014-05-12 Zan Dobersek <zdobersek@igalia.com>
+
+ Clean up MainThreadTask
+ https://bugs.webkit.org/show_bug.cgi?id=132799
+
+ Reviewed by Darin Adler.
+
+ Only have one simple MainThreadTask class that derives from std::function<void ()>.
+ Its templated constructor takes in the method and a variadic pack of parameters.
+ The cross-thread copies of the parameter are then bound to the given method through
+ std::bind(), with the resulting bind expression used to initialize the base
+ std::function<void ()> class.
+
+ The WebCore::callOnMainThread() functions and the helper classes are removed in favor
+ of passing MainThreadTask rvalues directly to WTF::callOnMainThread().
+
+ * fileapi/AsyncFileStream.cpp:
+ (WebCore::AsyncFileStream::startOnFileThread):
+ (WebCore::AsyncFileStream::stopOnFileThread):
+ (WebCore::AsyncFileStream::getSizeOnFileThread):
+ (WebCore::AsyncFileStream::openForReadOnFileThread):
+ (WebCore::AsyncFileStream::openForWriteOnFileThread):
+ (WebCore::AsyncFileStream::readOnFileThread):
+ (WebCore::AsyncFileStream::writeOnFileThread):
+ (WebCore::AsyncFileStream::truncateOnFileThread):
+ * platform/MainThreadTask.h:
+ (WebCore::MainThreadTask::MainThreadTask):
+ (WebCore::MainThreadTaskBase::MainThreadTaskBase): Deleted.
+ (WebCore::MainThreadTaskBase::~MainThreadTaskBase): Deleted.
+ (WebCore::MainThreadTask1::create): Deleted.
+ (WebCore::MainThreadTask1::MainThreadTask1): Deleted.
+ (WebCore::MainThreadTask2::create): Deleted.
+ (WebCore::MainThreadTask2::MainThreadTask2): Deleted.
+ (WebCore::MainThreadTask3::create): Deleted.
+ (WebCore::MainThreadTask3::MainThreadTask3): Deleted.
+ (WebCore::MainThreadTask4::create): Deleted.
+ (WebCore::MainThreadTask4::MainThreadTask4): Deleted.
+ (WebCore::MainThreadTask5::create): Deleted.
+ (WebCore::MainThreadTask5::MainThreadTask5): Deleted.
+ (WebCore::MainThreadTask6::create): Deleted.
+ (WebCore::MainThreadTask6::MainThreadTask6): Deleted.
+ (WebCore::MainThreadTask7::create): Deleted.
+ (WebCore::MainThreadTask7::MainThreadTask7): Deleted.
+ (WebCore::MainThreadTask8::create): Deleted.
+ (WebCore::MainThreadTask8::MainThreadTask8): Deleted.
+ (WebCore::executeMainThreadTask): Deleted.
+ (WebCore::callOnMainThread): Deleted.
+
</ins><span class="cx"> 2014-05-11 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Simplify FileThread::Task usage
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiAsyncFileStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/AsyncFileStream.cpp (168610 => 168611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/AsyncFileStream.cpp 2014-05-12 07:01:24 UTC (rev 168610)
+++ trunk/Source/WebCore/fileapi/AsyncFileStream.cpp 2014-05-12 07:04:59 UTC (rev 168611)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx"> if (!m_client)
</span><span class="cx"> return;
</span><span class="cx"> m_stream->start();
</span><del>- callOnMainThread(didStart, AllowCrossThreadAccess(this));
</del><ins>+ callOnMainThread(MainThreadTask(didStart, AllowCrossThreadAccess(this)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AsyncFileStream::stop()
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> void AsyncFileStream::stopOnFileThread()
</span><span class="cx"> {
</span><span class="cx"> m_stream->stop();
</span><del>- callOnMainThread(derefProxyOnMainThread, AllowCrossThreadAccess(this));
</del><ins>+ callOnMainThread(MainThreadTask(derefProxyOnMainThread, AllowCrossThreadAccess(this)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didGetSize(AsyncFileStream* proxy, long long size)
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> void AsyncFileStream::getSizeOnFileThread(const String& path, double expectedModificationTime)
</span><span class="cx"> {
</span><span class="cx"> long long size = m_stream->getSize(path, expectedModificationTime);
</span><del>- callOnMainThread(didGetSize, AllowCrossThreadAccess(this), size);
</del><ins>+ callOnMainThread(MainThreadTask(didGetSize, AllowCrossThreadAccess(this), size));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didOpen(AsyncFileStream* proxy, bool success)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> void AsyncFileStream::openForReadOnFileThread(const String& path, long long offset, long long length)
</span><span class="cx"> {
</span><span class="cx"> bool success = m_stream->openForRead(path, offset, length);
</span><del>- callOnMainThread(didOpen, AllowCrossThreadAccess(this), success);
</del><ins>+ callOnMainThread(MainThreadTask(didOpen, AllowCrossThreadAccess(this), success));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AsyncFileStream::openForWrite(const String& path)
</span><span class="lines">@@ -166,7 +166,7 @@
</span><span class="cx"> void AsyncFileStream::openForWriteOnFileThread(const String& path)
</span><span class="cx"> {
</span><span class="cx"> bool success = m_stream->openForWrite(path);
</span><del>- callOnMainThread(didOpen, AllowCrossThreadAccess(this), success);
</del><ins>+ callOnMainThread(MainThreadTask(didOpen, AllowCrossThreadAccess(this), success));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AsyncFileStream::close()
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> void AsyncFileStream::readOnFileThread(char* buffer, int length)
</span><span class="cx"> {
</span><span class="cx"> int bytesRead = m_stream->read(buffer, length);
</span><del>- callOnMainThread(didRead, AllowCrossThreadAccess(this), bytesRead);
</del><ins>+ callOnMainThread(MainThreadTask(didRead, AllowCrossThreadAccess(this), bytesRead));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didWrite(AsyncFileStream* proxy, int bytesWritten)
</span><span class="lines">@@ -210,7 +210,7 @@
</span><span class="cx"> void AsyncFileStream::writeOnFileThread(const URL& blobURL, long long position, int length)
</span><span class="cx"> {
</span><span class="cx"> int bytesWritten = m_stream->write(blobURL, position, length);
</span><del>- callOnMainThread(didWrite, AllowCrossThreadAccess(this), bytesWritten);
</del><ins>+ callOnMainThread(MainThreadTask(didWrite, AllowCrossThreadAccess(this), bytesWritten));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void didTruncate(AsyncFileStream* proxy, bool success)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> void AsyncFileStream::truncateOnFileThread(long long position)
</span><span class="cx"> {
</span><span class="cx"> bool success = m_stream->truncate(position);
</span><del>- callOnMainThread(didTruncate, AllowCrossThreadAccess(this), success);
</del><ins>+ callOnMainThread(MainThreadTask(didTruncate, AllowCrossThreadAccess(this), success));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformMainThreadTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/MainThreadTask.h (168610 => 168611)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/MainThreadTask.h 2014-05-12 07:01:24 UTC (rev 168610)
+++ trunk/Source/WebCore/platform/MainThreadTask.h 2014-05-12 07:04:59 UTC (rev 168611)
</span><span class="lines">@@ -33,460 +33,19 @@
</span><span class="cx"> #define MainThreadTask_h
</span><span class="cx">
</span><span class="cx"> #include "CrossThreadCopier.h"
</span><del>-#include <memory>
-#include <wtf/MainThread.h>
-#include <wtf/PassOwnPtr.h>
-#include <wtf/PassRefPtr.h>
</del><ins>+#include <functional>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// Traits for the MainThreadTask.
-template<typename T> struct MainThreadTaskTraits {
- typedef const T& ParamType;
-};
-
-template<typename T> struct MainThreadTaskTraits<T*> {
- typedef T* ParamType;
-};
-
-template<typename T> struct MainThreadTaskTraits<PassRefPtr<T>> {
- typedef PassRefPtr<T> ParamType;
-};
-
-template<typename T> struct MainThreadTaskTraits<PassOwnPtr<T>> {
- typedef PassOwnPtr<T> ParamType;
-};
-
-class MainThreadTaskBase {
-WTF_MAKE_NONCOPYABLE(MainThreadTaskBase);
-WTF_MAKE_FAST_ALLOCATED;
</del><ins>+class MainThreadTask : public std::function<void ()> {
</ins><span class="cx"> public:
</span><del>- MainThreadTaskBase() { }
- virtual void performTask() = 0;
- virtual ~MainThreadTaskBase() { }
-};
-
-template<typename P1, typename MP1>
-class MainThreadTask1 : public MainThreadTaskBase {
-public:
- typedef void (*Method)(MP1);
- typedef MainThreadTask1<P1, MP1> MainThreadTask;
- typedef typename MainThreadTaskTraits<P1>::ParamType Param1;
-
- static PassOwnPtr<MainThreadTask> create(Method method, Param1 parameter1)
</del><ins>+ template<typename Method, typename... Parameters>
+ MainThreadTask(Method method, const Parameters&... parameters)
+ : std::function<void ()>(std::bind(method, typename CrossThreadCopier<Parameters>::Type(CrossThreadCopier<Parameters>::copy(parameters))...))
</ins><span class="cx"> {
</span><del>- return adoptPtr(new MainThreadTask(method, parameter1));
</del><span class="cx"> }
</span><del>-
-private:
- MainThreadTask1(Method method, Param1 parameter1)
- : m_method(method)
- , m_parameter1(parameter1)
- {
- }
-
- virtual void performTask() override
- {
- (*m_method)(m_parameter1);
- }
-
-private:
- Method m_method;
- P1 m_parameter1;
</del><span class="cx"> };
</span><span class="cx">
</span><del>-template<typename P1, typename MP1, typename P2, typename MP2>
-class MainThreadTask2 : public MainThreadTaskBase {
-public:
- typedef void (*Method)(MP1, MP2);
- typedef MainThreadTask2<P1, MP1, P2, MP2> MainThreadTask;
- typedef typename MainThreadTaskTraits<P1>::ParamType Param1;
- typedef typename MainThreadTaskTraits<P2>::ParamType Param2;
-
- static PassOwnPtr<MainThreadTask> create(Method method, Param1 parameter1, Param2 parameter2)
- {
- return adoptPtr(new MainThreadTask(method, parameter1, parameter2));
- }
-
-private:
- MainThreadTask2(Method method, Param1 parameter1, Param2 parameter2)
- : m_method(method)
- , m_parameter1(parameter1)
- , m_parameter2(parameter2)
- {
- }
-
- virtual void performTask() override
- {
- (*m_method)(m_parameter1, m_parameter2);
- }
-
-private:
- Method m_method;
- P1 m_parameter1;
- P2 m_parameter2;
-};
-
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
-class MainThreadTask3 : public MainThreadTaskBase {
-public:
- typedef void (*Method)(MP1, MP2, MP3);
- typedef MainThreadTask3<P1, MP1, P2, MP2, P3, MP3> MainThreadTask;
- typedef typename MainThreadTaskTraits<P1>::ParamType Param1;
- typedef typename MainThreadTaskTraits<P2>::ParamType Param2;
- typedef typename MainThreadTaskTraits<P3>::ParamType Param3;
-
- static PassOwnPtr<MainThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3)
- {
- return adoptPtr(new MainThreadTask(method, parameter1, parameter2, parameter3));
- }
-
-private:
- MainThreadTask3(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3)
- : m_method(method)
- , m_parameter1(parameter1)
- , m_parameter2(parameter2)
- , m_parameter3(parameter3)
- {
- }
-
- virtual void performTask() override
- {
- (*m_method)(m_parameter1, m_parameter2, m_parameter3);
- }
-
-private:
- Method m_method;
- P1 m_parameter1;
- P2 m_parameter2;
- P3 m_parameter3;
-};
-
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4>
-class MainThreadTask4 : public MainThreadTaskBase {
-public:
- typedef void (*Method)(MP1, MP2, MP3, MP4);
- typedef MainThreadTask4<P1, MP1, P2, MP2, P3, MP3, P4, MP4> MainThreadTask;
- typedef typename MainThreadTaskTraits<P1>::ParamType Param1;
- typedef typename MainThreadTaskTraits<P2>::ParamType Param2;
- typedef typename MainThreadTaskTraits<P3>::ParamType Param3;
- typedef typename MainThreadTaskTraits<P4>::ParamType Param4;
-
- static PassOwnPtr<MainThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4)
- {
- return adoptPtr(new MainThreadTask(method, parameter1, parameter2, parameter3, parameter4));
- }
-
-private:
- MainThreadTask4(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4)
- : m_method(method)
- , m_parameter1(parameter1)
- , m_parameter2(parameter2)
- , m_parameter3(parameter3)
- , m_parameter4(parameter4)
- {
- }
-
- virtual void performTask() override
- {
- (*m_method)(m_parameter1, m_parameter2, m_parameter3, m_parameter4);
- }
-
-private:
- Method m_method;
- P1 m_parameter1;
- P2 m_parameter2;
- P3 m_parameter3;
- P4 m_parameter4;
-};
-
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5>
-class MainThreadTask5 : public MainThreadTaskBase {
-public:
- typedef void (*Method)(MP1, MP2, MP3, MP4, MP5);
- typedef MainThreadTask5<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5> MainThreadTask;
- typedef typename MainThreadTaskTraits<P1>::ParamType Param1;
- typedef typename MainThreadTaskTraits<P2>::ParamType Param2;
- typedef typename MainThreadTaskTraits<P3>::ParamType Param3;
- typedef typename MainThreadTaskTraits<P4>::ParamType Param4;
- typedef typename MainThreadTaskTraits<P5>::ParamType Param5;
-
- static PassOwnPtr<MainThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5)
- {
- return adoptPtr(new MainThreadTask(method, parameter1, parameter2, parameter3, parameter4, parameter5));
- }
-
-private:
- MainThreadTask5(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5)
- : m_method(method)
- , m_parameter1(parameter1)
- , m_parameter2(parameter2)
- , m_parameter3(parameter3)
- , m_parameter4(parameter4)
- , m_parameter5(parameter5)
- {
- }
-
- virtual void performTask() override
- {
- (*m_method)(m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5);
- }
-
-private:
- Method m_method;
- P1 m_parameter1;
- P2 m_parameter2;
- P3 m_parameter3;
- P4 m_parameter4;
- P5 m_parameter5;
-};
-
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6>
-class MainThreadTask6 : public MainThreadTaskBase {
-public:
- typedef void (*Method)(MP1, MP2, MP3, MP4, MP5, MP6);
- typedef MainThreadTask6<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6> MainThreadTask;
- typedef typename MainThreadTaskTraits<P1>::ParamType Param1;
- typedef typename MainThreadTaskTraits<P2>::ParamType Param2;
- typedef typename MainThreadTaskTraits<P3>::ParamType Param3;
- typedef typename MainThreadTaskTraits<P4>::ParamType Param4;
- typedef typename MainThreadTaskTraits<P5>::ParamType Param5;
- typedef typename MainThreadTaskTraits<P6>::ParamType Param6;
-
- static PassOwnPtr<MainThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6)
- {
- return adoptPtr(new MainThreadTask(method, parameter1, parameter2, parameter3, parameter4, parameter5, parameter6));
- }
-
-private:
- MainThreadTask6(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6)
- : m_method(method)
- , m_parameter1(parameter1)
- , m_parameter2(parameter2)
- , m_parameter3(parameter3)
- , m_parameter4(parameter4)
- , m_parameter5(parameter5)
- , m_parameter6(parameter6)
- {
- }
-
- virtual void performTask() override
- {
- (*m_method)(m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5, m_parameter6);
- }
-
-private:
- Method m_method;
- P1 m_parameter1;
- P2 m_parameter2;
- P3 m_parameter3;
- P4 m_parameter4;
- P5 m_parameter5;
- P6 m_parameter6;
-};
-
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7>
-class MainThreadTask7 : public MainThreadTaskBase {
-public:
- typedef void (*Method)(MP1, MP2, MP3, MP4, MP5, MP6, MP7);
- typedef MainThreadTask7<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6, P7, MP7> MainThreadTask;
- typedef typename MainThreadTaskTraits<P1>::ParamType Param1;
- typedef typename MainThreadTaskTraits<P2>::ParamType Param2;
- typedef typename MainThreadTaskTraits<P3>::ParamType Param3;
- typedef typename MainThreadTaskTraits<P4>::ParamType Param4;
- typedef typename MainThreadTaskTraits<P5>::ParamType Param5;
- typedef typename MainThreadTaskTraits<P6>::ParamType Param6;
- typedef typename MainThreadTaskTraits<P7>::ParamType Param7;
-
- static PassOwnPtr<MainThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7)
- {
- return adoptPtr(new MainThreadTask(method, parameter1, parameter2, parameter3, parameter4, parameter5, parameter6, parameter7));
- }
-
-private:
- MainThreadTask7(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7)
- : m_method(method)
- , m_parameter1(parameter1)
- , m_parameter2(parameter2)
- , m_parameter3(parameter3)
- , m_parameter4(parameter4)
- , m_parameter5(parameter5)
- , m_parameter6(parameter6)
- , m_parameter7(parameter7)
- {
- }
-
- virtual void performTask() override
- {
- (*m_method)(m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5, m_parameter6, m_parameter7);
- }
-
-private:
- Method m_method;
- P1 m_parameter1;
- P2 m_parameter2;
- P3 m_parameter3;
- P4 m_parameter4;
- P5 m_parameter5;
- P6 m_parameter6;
- P7 m_parameter7;
-};
-
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7, typename P8, typename MP8>
-class MainThreadTask8 : public MainThreadTaskBase {
-public:
- typedef void (*Method)(MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8);
- typedef MainThreadTask8<P1, MP1, P2, MP2, P3, MP3, P4, MP4, P5, MP5, P6, MP6, P7, MP7, P8, MP8> MainThreadTask;
- typedef typename MainThreadTaskTraits<P1>::ParamType Param1;
- typedef typename MainThreadTaskTraits<P2>::ParamType Param2;
- typedef typename MainThreadTaskTraits<P3>::ParamType Param3;
- typedef typename MainThreadTaskTraits<P4>::ParamType Param4;
- typedef typename MainThreadTaskTraits<P5>::ParamType Param5;
- typedef typename MainThreadTaskTraits<P6>::ParamType Param6;
- typedef typename MainThreadTaskTraits<P7>::ParamType Param7;
- typedef typename MainThreadTaskTraits<P8>::ParamType Param8;
-
- static PassOwnPtr<MainThreadTask> create(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7, Param8 parameter8)
- {
- return adoptPtr(new MainThreadTask(method, parameter1, parameter2, parameter3, parameter4, parameter5, parameter6, parameter7, parameter8));
- }
-
-private:
- MainThreadTask8(Method method, Param1 parameter1, Param2 parameter2, Param3 parameter3, Param4 parameter4, Param5 parameter5, Param6 parameter6, Param7 parameter7, Param8 parameter8)
- : m_method(method)
- , m_parameter1(parameter1)
- , m_parameter2(parameter2)
- , m_parameter3(parameter3)
- , m_parameter4(parameter4)
- , m_parameter5(parameter5)
- , m_parameter6(parameter6)
- , m_parameter7(parameter7)
- , m_parameter8(parameter8)
- {
- }
-
- virtual void performTask() override
- {
- (*m_method)(m_parameter1, m_parameter2, m_parameter3, m_parameter4, m_parameter5, m_parameter6, m_parameter7, m_parameter8);
- }
-
-private:
- Method m_method;
- P1 m_parameter1;
- P2 m_parameter2;
- P3 m_parameter3;
- P4 m_parameter4;
- P5 m_parameter5;
- P6 m_parameter6;
- P7 m_parameter7;
- P8 m_parameter8;
-};
-
-static void executeMainThreadTask(void* context)
-{
- OwnPtr<MainThreadTaskBase> task = adoptPtr(static_cast<MainThreadTaskBase*>(context));
- task->performTask();
-}
-
-template<typename P1, typename MP1>
-void callOnMainThread(
- void (*method)(MP1),
- const P1& parameter1)
-{
- WTF::callOnMainThread(executeMainThreadTask, MainThreadTask1<typename CrossThreadCopier<P1>::Type, MP1>::create(
- method,
- CrossThreadCopier<P1>::copy(parameter1)).leakPtr());
-}
-
-template<typename P1, typename MP1, typename P2, typename MP2>
-void callOnMainThread(
- void (*method)(MP1, MP2),
- const P1& parameter1, const P2& parameter2)
-{
- WTF::callOnMainThread(executeMainThreadTask, MainThreadTask2<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2>::create(
- method,
- CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2)).leakPtr());
-}
-
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
-void callOnMainThread(
- void (*method)(MP1, MP2, MP3),
- const P1& parameter1, const P2& parameter2, const P3& parameter3)
-{
- WTF::callOnMainThread(executeMainThreadTask, MainThreadTask3<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3>::create(
- method,
- CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
- CrossThreadCopier<P3>::copy(parameter3)).leakPtr());
-}
-
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4>
-void callOnMainThread(
- void (*method)(MP1, MP2, MP3, MP4),
- const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4)
-{
- WTF::callOnMainThread(executeMainThreadTask, MainThreadTask4<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
- typename CrossThreadCopier<P4>::Type, MP4>::create(
- method,
- CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
- CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4)).leakPtr());
-}
-
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5>
-void callOnMainThread(
- void (*method)(MP1, MP2, MP3, MP4, MP5),
- const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5)
-{
- WTF::callOnMainThread(executeMainThreadTask, MainThreadTask5<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
- typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5>::create(
- method,
- CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
- CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4),
- CrossThreadCopier<P5>::copy(parameter5)).leakPtr());
-}
-
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6>
-void callOnMainThread(
- void (*method)(MP1, MP2, MP3, MP4, MP5, MP6),
- const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6)
-{
- WTF::callOnMainThread(executeMainThreadTask, MainThreadTask6<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
- typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6>::create(
- method,
- CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
- CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4),
- CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6)).leakPtr());
-}
-
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7>
-void callOnMainThread(
- void (*method)(MP1, MP2, MP3, MP4, MP5, MP6, MP7),
- const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6, const P7& parameter7)
-{
- WTF::callOnMainThread(executeMainThreadTask, MainThreadTask7<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
- typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6,
- typename CrossThreadCopier<P7>::Type, MP7>::create(
- method,
- CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
- CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4),
- CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6),
- CrossThreadCopier<P7>::copy(parameter7)).leakPtr());
-}
-
-template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7, typename P8, typename MP8>
-void callOnMainThread(
- void (*method)(MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8),
- const P1& parameter1, const P2& parameter2, const P3& parameter3, const P4& parameter4, const P5& parameter5, const P6& parameter6, const P7& parameter7, const P8& parameter8)
-{
- WTF::callOnMainThread(executeMainThreadTask, MainThreadTask8<typename CrossThreadCopier<P1>::Type, MP1, typename CrossThreadCopier<P2>::Type, MP2, typename CrossThreadCopier<P3>::Type, MP3,
- typename CrossThreadCopier<P4>::Type, MP4, typename CrossThreadCopier<P5>::Type, MP5, typename CrossThreadCopier<P6>::Type, MP6,
- typename CrossThreadCopier<P7>::Type, MP7, typename CrossThreadCopier<P8>::Type, MP8>::create(
- method,
- CrossThreadCopier<P1>::copy(parameter1), CrossThreadCopier<P2>::copy(parameter2),
- CrossThreadCopier<P3>::copy(parameter3), CrossThreadCopier<P4>::copy(parameter4),
- CrossThreadCopier<P5>::copy(parameter5), CrossThreadCopier<P6>::copy(parameter6),
- CrossThreadCopier<P7>::copy(parameter7), CrossThreadCopier<P8>::copy(parameter8)).leakPtr());
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>