<!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>[159115] 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/159115">159115</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2013-11-12 09:33:10 -0800 (Tue, 12 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Manage StorageThread through std::unique_ptr
https://bugs.webkit.org/show_bug.cgi?id=124197

Reviewed by Anders Carlsson.

New StorageThread objects are crafted through std::make_unique. This removes the need for the static
StorageThread::create() method but requires that the StorageThread constructor is made public.

* storage/StorageSyncManager.cpp:
(WebCore::StorageSyncManager::StorageSyncManager):
* storage/StorageSyncManager.h:
* storage/StorageThread.cpp:
* storage/StorageThread.h:
* storage/StorageTracker.cpp:
(WebCore::StorageTracker::StorageTracker):
* storage/StorageTracker.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorestorageStorageSyncManagercpp">trunk/Source/WebCore/storage/StorageSyncManager.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageSyncManagerh">trunk/Source/WebCore/storage/StorageSyncManager.h</a></li>
<li><a href="#trunkSourceWebCorestorageStorageThreadcpp">trunk/Source/WebCore/storage/StorageThread.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageThreadh">trunk/Source/WebCore/storage/StorageThread.h</a></li>
<li><a href="#trunkSourceWebCorestorageStorageTrackercpp">trunk/Source/WebCore/storage/StorageTracker.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageTrackerh">trunk/Source/WebCore/storage/StorageTracker.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159114 => 159115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-12 17:30:16 UTC (rev 159114)
+++ trunk/Source/WebCore/ChangeLog        2013-11-12 17:33:10 UTC (rev 159115)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2013-11-12  Zan Dobersek  &lt;zdobersek@igalia.com&gt;
</span><span class="cx"> 
</span><ins>+        Manage StorageThread through std::unique_ptr
+        https://bugs.webkit.org/show_bug.cgi?id=124197
+
+        Reviewed by Anders Carlsson.
+
+        New StorageThread objects are crafted through std::make_unique. This removes the need for the static
+        StorageThread::create() method but requires that the StorageThread constructor is made public.
+
+        * storage/StorageSyncManager.cpp:
+        (WebCore::StorageSyncManager::StorageSyncManager):
+        * storage/StorageSyncManager.h:
+        * storage/StorageThread.cpp:
+        * storage/StorageThread.h:
+        * storage/StorageTracker.cpp:
+        (WebCore::StorageTracker::StorageTracker):
+        * storage/StorageTracker.h:
+
+2013-11-12  Zan Dobersek  &lt;zdobersek@igalia.com&gt;
+
</ins><span class="cx">         Remove unnecessary PassOwnPtr.h header includes under Source/WebCore/fileapi
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=124196
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageSyncManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageSyncManager.cpp (159114 => 159115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageSyncManager.cpp        2013-11-12 17:30:16 UTC (rev 159114)
+++ trunk/Source/WebCore/storage/StorageSyncManager.cpp        2013-11-12 17:33:10 UTC (rev 159115)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> StorageSyncManager::StorageSyncManager(const String&amp; path)
</span><del>-    : m_thread(StorageThread::create())
</del><ins>+    : m_thread(std::make_unique&lt;StorageThread&gt;())
</ins><span class="cx">     , m_path(path.isolatedCopy())
</span><span class="cx"> {
</span><span class="cx">     ASSERT(isMainThread());
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageSyncManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageSyncManager.h (159114 => 159115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageSyncManager.h        2013-11-12 17:30:16 UTC (rev 159114)
+++ trunk/Source/WebCore/storage/StorageSyncManager.h        2013-11-12 17:33:10 UTC (rev 159115)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include &lt;wtf/Forward.h&gt;
</span><span class="cx"> #include &lt;wtf/PassRefPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/RefCounted.h&gt;
</span><del>-#include &lt;wtf/OwnPtr.h&gt;
</del><span class="cx"> #include &lt;wtf/text/WTFString.h&gt;
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -48,7 +47,7 @@
</span><span class="cx"> private:
</span><span class="cx">     explicit StorageSyncManager(const String&amp; path);
</span><span class="cx"> 
</span><del>-    OwnPtr&lt;StorageThread&gt; m_thread;
</del><ins>+    std::unique_ptr&lt;StorageThread&gt; m_thread;
</ins><span class="cx"> 
</span><span class="cx"> // The following members are subject to thread synchronization issues
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageThread.cpp (159114 => 159115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageThread.cpp        2013-11-12 17:30:16 UTC (rev 159114)
+++ trunk/Source/WebCore/storage/StorageThread.cpp        2013-11-12 17:33:10 UTC (rev 159115)
</span><span class="lines">@@ -40,11 +40,6 @@
</span><span class="cx">     return threads;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-PassOwnPtr&lt;StorageThread&gt; StorageThread::create()
-{
-    return adoptPtr(new StorageThread);
-}
-
</del><span class="cx"> StorageThread::StorageThread()
</span><span class="cx">     : m_threadID(0)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageThread.h (159114 => 159115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageThread.h        2013-11-12 17:30:16 UTC (rev 159114)
+++ trunk/Source/WebCore/storage/StorageThread.h        2013-11-12 17:33:10 UTC (rev 159115)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include &lt;wtf/Functional.h&gt;
</span><span class="cx"> #include &lt;wtf/HashSet.h&gt;
</span><span class="cx"> #include &lt;wtf/MessageQueue.h&gt;
</span><del>-#include &lt;wtf/PassOwnPtr.h&gt;
</del><span class="cx"> #include &lt;wtf/PassRefPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/Threading.h&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -41,7 +40,7 @@
</span><span class="cx"> class StorageThread {
</span><span class="cx">     WTF_MAKE_NONCOPYABLE(StorageThread); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>-    static PassOwnPtr&lt;StorageThread&gt; create();
</del><ins>+    StorageThread();
</ins><span class="cx">     ~StorageThread();
</span><span class="cx"> 
</span><span class="cx">     bool start();
</span><span class="lines">@@ -52,8 +51,6 @@
</span><span class="cx">     static void releaseFastMallocFreeMemoryInAllThreads();
</span><span class="cx"> 
</span><span class="cx"> private:
</span><del>-    StorageThread();
-
</del><span class="cx">     // Called on background thread.
</span><span class="cx">     static void threadEntryPointCallback(void*);
</span><span class="cx">     void threadEntryPoint();
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageTracker.cpp (159114 => 159115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageTracker.cpp        2013-11-12 17:30:16 UTC (rev 159114)
+++ trunk/Source/WebCore/storage/StorageTracker.cpp        2013-11-12 17:33:10 UTC (rev 159115)
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> StorageTracker::StorageTracker(const String&amp; storagePath)
</span><span class="cx">     : m_storageDirectoryPath(storagePath.isolatedCopy())
</span><span class="cx">     , m_client(0)
</span><del>-    , m_thread(StorageThread::create())
</del><ins>+    , m_thread(std::make_unique&lt;StorageThread&gt;())
</ins><span class="cx">     , m_isActive(false)
</span><span class="cx">     , m_needsInitialization(false)
</span><span class="cx">     , m_StorageDatabaseIdleInterval(DefaultStorageDatabaseIdleInterval)
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageTracker.h (159114 => 159115)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageTracker.h        2013-11-12 17:30:16 UTC (rev 159114)
+++ trunk/Source/WebCore/storage/StorageTracker.h        2013-11-12 17:33:10 UTC (rev 159115)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;SQLiteDatabase.h&quot;
</span><span class="cx"> #include &lt;wtf/HashSet.h&gt;
</span><del>-#include &lt;wtf/OwnPtr.h&gt;
</del><span class="cx"> #include &lt;wtf/Vector.h&gt;
</span><span class="cx"> #include &lt;wtf/text/StringHash.h&gt;
</span><span class="cx"> #include &lt;wtf/text/WTFString.h&gt;
</span><span class="lines">@@ -109,7 +108,7 @@
</span><span class="cx">     OriginSet m_originSet;
</span><span class="cx">     OriginSet m_originsBeingDeleted;
</span><span class="cx"> 
</span><del>-    OwnPtr&lt;StorageThread&gt; m_thread;
</del><ins>+    std::unique_ptr&lt;StorageThread&gt; m_thread;
</ins><span class="cx">     
</span><span class="cx">     bool m_isActive;
</span><span class="cx">     bool m_needsInitialization;
</span></span></pre>
</div>
</div>

</body>
</html>