<!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>[180054] trunk/Source/WebKit2</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/180054">180054</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2015-02-13 09:50:15 -0800 (Fri, 13 Feb 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>WorkQueue should support concurrent queues
https://bugs.webkit.org/show_bug.cgi?id=141559

Reviewed by Anders Carlsson.

* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::DatabaseProcess):
* Platform/IPC/Connection.h:
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::Connection::open):
* Platform/WorkQueue.cpp:
(WorkQueue::create):

    Also make create return a Ref.

(WorkQueue::WorkQueue):
* Platform/WorkQueue.h:

    Add queue type enum.

* Platform/efl/WorkQueueEfl.cpp:
(WorkQueue::platformInitialize):
* Platform/gtk/WorkQueueGtk.cpp:
(WorkQueue::platformInitialize):
* Platform/mac/WorkQueueMac.cpp:
(WorkQueue::platformInitialize):
* Shared/mac/SecItemShim.cpp:
(WebKit::SecItemShim::initializeConnection):
* Shared/mac/SecItemShim.h:
* UIProcess/Launcher/ProcessLauncher.cpp:
(WebKit::processLauncherWorkQueue):
* UIProcess/mac/SecItemShimProxy.cpp:
(WebKit::SecItemShimProxy::initializeConnection):
* UIProcess/mac/SecItemShimProxy.h:
* WebProcess/Plugins/PluginProcessConnectionManager.cpp:
(WebKit::PluginProcessConnectionManager::initializeConnection):
* WebProcess/Plugins/PluginProcessConnectionManager.h:
* WebProcess/WebPage/EventDispatcher.cpp:
(WebKit::EventDispatcher::EventDispatcher):
(WebKit::EventDispatcher::initializeConnection):
* WebProcess/WebPage/EventDispatcher.h:
* WebProcess/WebPage/ViewUpdateDispatcher.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformWorkQueuecpp">trunk/Source/WebKit2/Platform/WorkQueue.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformWorkQueueh">trunk/Source/WebKit2/Platform/WorkQueue.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformeflWorkQueueEflcpp">trunk/Source/WebKit2/Platform/efl/WorkQueueEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformgtkWorkQueueGtkcpp">trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformmacWorkQueueMaccpp">trunk/Source/WebKit2/Platform/mac/WorkQueueMac.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSecItemShimcpp">trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedmacSecItemShimh">trunk/Source/WebKit2/Shared/mac/SecItemShim.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessLauncherProcessLaunchercpp">trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacSecItemShimProxycpp">trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacSecItemShimProxyh">trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionManagercpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionManagerh">trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatcherh">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageViewUpdateDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageViewUpdateDispatcherh">trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/ChangeLog        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2015-02-13  Antti Koivisto  &lt;antti@apple.com&gt;
+
+        WorkQueue should support concurrent queues
+        https://bugs.webkit.org/show_bug.cgi?id=141559
+
+        Reviewed by Anders Carlsson.
+
+        * DatabaseProcess/DatabaseProcess.cpp:
+        (WebKit::DatabaseProcess::DatabaseProcess):
+        * Platform/IPC/Connection.h:
+        * Platform/IPC/mac/ConnectionMac.mm:
+        (IPC::Connection::open):
+        * Platform/WorkQueue.cpp:
+        (WorkQueue::create):
+
+            Also make create return a Ref.
+
+        (WorkQueue::WorkQueue):
+        * Platform/WorkQueue.h:
+
+            Add queue type enum.
+
+        * Platform/efl/WorkQueueEfl.cpp:
+        (WorkQueue::platformInitialize):
+        * Platform/gtk/WorkQueueGtk.cpp:
+        (WorkQueue::platformInitialize):
+        * Platform/mac/WorkQueueMac.cpp:
+        (WorkQueue::platformInitialize):
+        * Shared/mac/SecItemShim.cpp:
+        (WebKit::SecItemShim::initializeConnection):
+        * Shared/mac/SecItemShim.h:
+        * UIProcess/Launcher/ProcessLauncher.cpp:
+        (WebKit::processLauncherWorkQueue):
+        * UIProcess/mac/SecItemShimProxy.cpp:
+        (WebKit::SecItemShimProxy::initializeConnection):
+        * UIProcess/mac/SecItemShimProxy.h:
+        * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
+        (WebKit::PluginProcessConnectionManager::initializeConnection):
+        * WebProcess/Plugins/PluginProcessConnectionManager.h:
+        * WebProcess/WebPage/EventDispatcher.cpp:
+        (WebKit::EventDispatcher::EventDispatcher):
+        (WebKit::EventDispatcher::initializeConnection):
+        * WebProcess/WebPage/EventDispatcher.h:
+        * WebProcess/WebPage/ViewUpdateDispatcher.h:
+
</ins><span class="cx"> 2015-02-12  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Clean up the framework postprocessing phase
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> DatabaseProcess::DatabaseProcess()
</span><del>-    : m_queue(adoptRef(*WorkQueue::create(&quot;com.apple.WebKit.DatabaseProcess&quot;).leakRef()))
</del><ins>+    : m_queue(WorkQueue::create(&quot;com.apple.WebKit.DatabaseProcess&quot;))
</ins><span class="cx">     , m_webOriginDataManager(std::make_unique&lt;WebOriginDataManager&gt;(*this, *this))
</span><span class="cx"> {
</span><span class="cx">     // Make sure the UTF8Encoding encoding and the text encoding maps have been built on the main thread before a background thread needs it.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -243,7 +243,7 @@
</span><span class="cx">     DidCloseOnConnectionWorkQueueCallback m_didCloseOnConnectionWorkQueueCallback;
</span><span class="cx"> 
</span><span class="cx">     bool m_isConnected;
</span><del>-    RefPtr&lt;WorkQueue&gt; m_connectionQueue;
</del><ins>+    Ref&lt;WorkQueue&gt; m_connectionQueue;
</ins><span class="cx">     WTF::RunLoop&amp; m_clientRunLoop;
</span><span class="cx"> 
</span><span class="cx">     HashMap&lt;StringReference, std::pair&lt;RefPtr&lt;WorkQueue&gt;, RefPtr&lt;WorkQueueMessageReceiver&gt;&gt;&gt; m_workQueueMessageReceivers;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -206,14 +206,14 @@
</span><span class="cx"> 
</span><span class="cx">     // Register the data available handler.
</span><span class="cx">     RefPtr&lt;Connection&gt; connection(this);
</span><del>-    m_receivePortDataAvailableSource = createDataAvailableSource(m_receivePort, *m_connectionQueue, [connection] {
</del><ins>+    m_receivePortDataAvailableSource = createDataAvailableSource(m_receivePort, m_connectionQueue, [connection] {
</ins><span class="cx">         connection-&gt;receiveSourceEventHandler();
</span><span class="cx">     });
</span><span class="cx"> 
</span><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx">     // If we have an exception port, register the data available handler and send over the port to the other end.
</span><span class="cx">     if (m_exceptionPort) {
</span><del>-        m_exceptionPortDataAvailableSource = createDataAvailableSource(m_exceptionPort, *m_connectionQueue, [connection] {
</del><ins>+        m_exceptionPortDataAvailableSource = createDataAvailableSource(m_exceptionPort, m_connectionQueue, [connection] {
</ins><span class="cx">             connection-&gt;exceptionSourceEventHandler();
</span><span class="cx">         });
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformWorkQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/WorkQueue.cpp (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/WorkQueue.cpp        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/Platform/WorkQueue.cpp        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -26,14 +26,14 @@
</span><span class="cx"> #include &quot;config.h&quot;
</span><span class="cx"> #include &quot;WorkQueue.h&quot;
</span><span class="cx"> 
</span><del>-PassRefPtr&lt;WorkQueue&gt; WorkQueue::create(const char* name, QOS qos)
</del><ins>+Ref&lt;WorkQueue&gt; WorkQueue::create(const char* name, Type type, QOS qos)
</ins><span class="cx"> {
</span><del>-    return adoptRef(new WorkQueue(name, qos));
</del><ins>+    return adoptRef(*new WorkQueue(name, type, qos));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-WorkQueue::WorkQueue(const char* name, QOS qos)
</del><ins>+WorkQueue::WorkQueue(const char* name, Type type, QOS qos)
</ins><span class="cx"> {
</span><del>-    platformInitialize(name, qos);
</del><ins>+    platformInitialize(name, type, qos);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> WorkQueue::~WorkQueue()
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/WorkQueue.h (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/WorkQueue.h        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/Platform/WorkQueue.h        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -54,6 +54,10 @@
</span><span class="cx"> 
</span><span class="cx"> class WorkQueue final : public FunctionDispatcher {
</span><span class="cx"> public:
</span><ins>+    enum class Type {
+        Serial,
+        Concurrent
+    };
</ins><span class="cx">     enum class QOS {
</span><span class="cx">         UserInteractive,
</span><span class="cx">         UserInitiated,
</span><span class="lines">@@ -62,7 +66,7 @@
</span><span class="cx">         Background
</span><span class="cx">     };
</span><span class="cx">     
</span><del>-    static PassRefPtr&lt;WorkQueue&gt; create(const char* name, QOS = QOS::Default);
</del><ins>+    static Ref&lt;WorkQueue&gt; create(const char* name, Type = Type::Serial, QOS = QOS::Default);
</ins><span class="cx">     virtual ~WorkQueue();
</span><span class="cx"> 
</span><span class="cx">     virtual void dispatch(std::function&lt;void ()&gt;) override;
</span><span class="lines">@@ -79,9 +83,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    explicit WorkQueue(const char* name, QOS);
</del><ins>+    explicit WorkQueue(const char* name, Type, QOS);
</ins><span class="cx"> 
</span><del>-    void platformInitialize(const char* name, QOS);
</del><ins>+    void platformInitialize(const char* name, Type, QOS);
</ins><span class="cx">     void platformInvalidate();
</span><span class="cx"> 
</span><span class="cx"> #if OS(DARWIN)
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformeflWorkQueueEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/efl/WorkQueueEfl.cpp (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/efl/WorkQueueEfl.cpp        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/Platform/efl/WorkQueueEfl.cpp        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> #include &lt;DispatchQueueEfl.h&gt;
</span><span class="cx"> #include &lt;DispatchQueueWorkItemEfl.h&gt;
</span><span class="cx"> 
</span><del>-void WorkQueue::platformInitialize(const char* name, QOS)
</del><ins>+void WorkQueue::platformInitialize(const char* name, Type, QOS)
</ins><span class="cx"> {
</span><span class="cx">     m_dispatchQueue = DispatchQueue::create(name);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformgtkWorkQueueGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> 
</span><span class="cx"> static const size_t kVisualStudioThreadNameLimit = 31;
</span><span class="cx"> 
</span><del>-void WorkQueue::platformInitialize(const char* name, QOS)
</del><ins>+void WorkQueue::platformInitialize(const char* name, Type, QOS)
</ins><span class="cx"> {
</span><span class="cx">     m_eventContext = adoptGRef(g_main_context_new());
</span><span class="cx">     ASSERT(m_eventContext);
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformmacWorkQueueMaccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/mac/WorkQueueMac.cpp (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/mac/WorkQueueMac.cpp        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/Platform/mac/WorkQueueMac.cpp        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -62,11 +62,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-void WorkQueue::platformInitialize(const char* name, QOS qos)
</del><ins>+void WorkQueue::platformInitialize(const char* name, Type type, QOS qos)
</ins><span class="cx"> {
</span><del>-    dispatch_queue_attr_t attr = 0;
</del><ins>+    dispatch_queue_attr_t attr = type == Type::Concurrent ? DISPATCH_QUEUE_CONCURRENT : DISPATCH_QUEUE_SERIAL;
</ins><span class="cx"> #if HAVE(QOS_CLASSES)
</span><del>-    attr = dispatch_queue_attr_make_with_qos_class(DISPATCH_QUEUE_SERIAL, dispatchQOSClass(qos), 0);
</del><ins>+    attr = dispatch_queue_attr_make_with_qos_class(attr, dispatchQOSClass(qos), 0);
</ins><span class="cx"> #endif
</span><span class="cx">     m_dispatchQueue = dispatch_queue_create(name, attr);
</span><span class="cx">     dispatch_set_context(m_dispatchQueue, this);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSecItemShimcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.cpp        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> 
</span><span class="cx"> void SecItemShim::initializeConnection(IPC::Connection* connection)
</span><span class="cx"> {
</span><del>-    connection-&gt;addWorkQueueMessageReceiver(Messages::SecItemShim::messageReceiverName(), m_queue.get(), this);
</del><ins>+    connection-&gt;addWorkQueueMessageReceiver(Messages::SecItemShim::messageReceiverName(), &amp;m_queue.get(), this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedmacSecItemShimh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/mac/SecItemShim.h (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/mac/SecItemShim.h        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/Shared/mac/SecItemShim.h        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> 
</span><span class="cx">     void secItemResponse(uint64_t requestID, const SecItemResponseData&amp;);
</span><span class="cx"> 
</span><del>-    RefPtr&lt;WorkQueue&gt; m_queue;
</del><ins>+    Ref&lt;WorkQueue&gt; m_queue;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessLauncherProcessLaunchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/UIProcess/Launcher/ProcessLauncher.cpp        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -27,13 +27,14 @@
</span><span class="cx"> #include &quot;ProcessLauncher.h&quot;
</span><span class="cx"> 
</span><span class="cx"> #include &quot;WorkQueue.h&quot;
</span><del>-#include &lt;wtf/StdLibExtras.h&gt;
</del><ins>+#include &lt;wtf/StdLibExtras.h&gt; 
</ins><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><span class="cx"> static WorkQueue&amp; processLauncherWorkQueue()
</span><span class="cx"> {
</span><del>-    static WorkQueue&amp; processLauncherWorkQueue = *WorkQueue::create(&quot;com.apple.WebKit.ProcessLauncher&quot;).leakRef();
</del><ins>+
+    static WorkQueue&amp; processLauncherWorkQueue = WorkQueue::create(&quot;com.apple.WebKit.ProcessLauncher&quot;).leakRef();
</ins><span class="cx">     return processLauncherWorkQueue;
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacSecItemShimProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> 
</span><span class="cx"> void SecItemShimProxy::initializeConnection(IPC::Connection&amp; connection)
</span><span class="cx"> {
</span><del>-    connection.addWorkQueueMessageReceiver(Messages::SecItemShimProxy::messageReceiverName(), m_queue.get(), this);
</del><ins>+    connection.addWorkQueueMessageReceiver(Messages::SecItemShimProxy::messageReceiverName(), &amp;m_queue.get(), this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void SecItemShimProxy::secItemRequest(IPC::Connection&amp; connection, uint64_t requestID, const SecItemRequestData&amp; request)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacSecItemShimProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> 
</span><span class="cx">     void secItemRequest(IPC::Connection&amp;, uint64_t requestID, const SecItemRequestData&amp;);
</span><span class="cx"> 
</span><del>-    RefPtr&lt;WorkQueue&gt; m_queue;
</del><ins>+    Ref&lt;WorkQueue&gt; m_queue;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> 
</span><span class="cx"> void PluginProcessConnectionManager::initializeConnection(IPC::Connection* connection)
</span><span class="cx"> {
</span><del>-    connection-&gt;addWorkQueueMessageReceiver(Messages::PluginProcessConnectionManager::messageReceiverName(), m_queue.get(), this);
</del><ins>+    connection-&gt;addWorkQueueMessageReceiver(Messages::PluginProcessConnectionManager::messageReceiverName(), &amp;m_queue.get(), this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> PluginProcessConnection* PluginProcessConnectionManager::getPluginProcessConnection(uint64_t pluginProcessToken)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.h        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> 
</span><span class="cx">     void pluginProcessCrashed(uint64_t pluginProcessToken);
</span><span class="cx"> 
</span><del>-    RefPtr&lt;WorkQueue&gt; m_queue;
</del><ins>+    Ref&lt;WorkQueue&gt; m_queue;
</ins><span class="cx"> 
</span><span class="cx">     Vector&lt;RefPtr&lt;PluginProcessConnection&gt;&gt; m_pluginProcessConnections;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> EventDispatcher::EventDispatcher()
</span><del>-    : m_queue(WorkQueue::create(&quot;com.apple.WebKit.EventDispatcher&quot;, WorkQueue::QOS::UserInteractive))
</del><ins>+    : m_queue(WorkQueue::create(&quot;com.apple.WebKit.EventDispatcher&quot;, WorkQueue::Type::Serial, WorkQueue::QOS::UserInteractive))
</ins><span class="cx">     , m_recentWheelEventDeltaTracker(std::make_unique&lt;WheelEventDeltaTracker&gt;())
</span><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx">     , m_touchEventsLock(SPINLOCK_INITIALIZER)
</span><span class="lines">@@ -87,7 +87,7 @@
</span><span class="cx"> 
</span><span class="cx"> void EventDispatcher::initializeConnection(IPC::Connection* connection)
</span><span class="cx"> {
</span><del>-    connection-&gt;addWorkQueueMessageReceiver(Messages::EventDispatcher::messageReceiverName(), m_queue.get(), this);
</del><ins>+    connection-&gt;addWorkQueueMessageReceiver(Messages::EventDispatcher::messageReceiverName(), &amp;m_queue.get(), this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void EventDispatcher::wheelEvent(uint64_t pageID, const WebWheelEvent&amp; wheelEvent, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.h        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">     void sendDidReceiveEvent(uint64_t pageID, const WebEvent&amp;, bool didHandleEvent);
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-    RefPtr&lt;WorkQueue&gt; m_queue;
</del><ins>+    Ref&lt;WorkQueue&gt; m_queue;
</ins><span class="cx"> 
</span><span class="cx"> #if ENABLE(ASYNC_SCROLLING)
</span><span class="cx">     Mutex m_scrollingTreesMutex;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageViewUpdateDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> 
</span><span class="cx"> void ViewUpdateDispatcher::initializeConnection(IPC::Connection* connection)
</span><span class="cx"> {
</span><del>-    connection-&gt;addWorkQueueMessageReceiver(Messages::ViewUpdateDispatcher::messageReceiverName(), m_queue.get(), this);
</del><ins>+    connection-&gt;addWorkQueueMessageReceiver(Messages::ViewUpdateDispatcher::messageReceiverName(), &amp;m_queue.get(), this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ViewUpdateDispatcher::visibleContentRectUpdate(uint64_t pageID, const VisibleContentRectUpdateInfo&amp; visibleContentRectUpdateInfo)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageViewUpdateDispatcherh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.h (180053 => 180054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.h        2015-02-13 17:38:50 UTC (rev 180053)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.h        2015-02-13 17:50:15 UTC (rev 180054)
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx">         double oldestTimestamp;
</span><span class="cx">     };
</span><span class="cx"> 
</span><del>-    RefPtr&lt;WorkQueue&gt; m_queue;
</del><ins>+    Ref&lt;WorkQueue&gt; m_queue;
</ins><span class="cx">     SpinLock m_dataMutex;
</span><span class="cx">     HashMap&lt;uint64_t, UpdateData&gt; m_latestUpdate;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>

</body>
</html>