<!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>[190332] trunk/Source</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/190332">190332</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-09-29 17:16:31 -0700 (Tue, 29 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Followup to "Move WebKit2 AsyncTask to WebCore CrossThreadTask."
https://bugs.webkit.org/show_bug.cgi?id=149651
Rubberstamped by Alex Christensen.
Source/WebCore:
No new tests (No change in behavior).
* platform/CrossThreadTask.h: Now in WebCore, use the WebCore namespace.
Source/WebKit2:
* DatabaseProcess/DatabaseProcess.h: CrossThreadTask is in the WebCore namespace, not WebKit.
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.h: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformCrossThreadTaskh">trunk/Source/WebCore/platform/CrossThreadTask.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessh">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (190331 => 190332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-09-29 23:28:22 UTC (rev 190331)
+++ trunk/Source/WebCore/ChangeLog 2015-09-30 00:16:31 UTC (rev 190332)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-09-29 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Followup to "Move WebKit2 AsyncTask to WebCore CrossThreadTask."
+ https://bugs.webkit.org/show_bug.cgi?id=149651
+
+ Rubberstamped by Alex Christensen.
+
+ No new tests (No change in behavior).
+
+ * platform/CrossThreadTask.h: Now in WebCore, use the WebCore namespace.
+
+2015-09-29 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Move WebKit2 AsyncTask to WebCore CrossThreadTask.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149651
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformCrossThreadTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/CrossThreadTask.h (190331 => 190332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/CrossThreadTask.h 2015-09-29 23:28:22 UTC (rev 190331)
+++ trunk/Source/WebCore/platform/CrossThreadTask.h 2015-09-30 00:16:31 UTC (rev 190332)
</span><span class="lines">@@ -29,7 +29,7 @@
</span><span class="cx"> #include "CrossThreadCopier.h"
</span><span class="cx"> #include <functional>
</span><span class="cx">
</span><del>-namespace WebKit {
</del><ins>+namespace WebCore {
</ins><span class="cx">
</span><span class="cx"> class CrossThreadTask {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CrossThreadTask);
</span><span class="lines">@@ -223,6 +223,6 @@
</span><span class="cx"> WebCore::CrossThreadCopier<P8>::copy(parameter8));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-} // namespace WebKit
</del><ins>+} // namespace WebCore
</ins><span class="cx">
</span><span class="cx"> #endif // CrossThreadTask_h
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (190331 => 190332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-09-29 23:28:22 UTC (rev 190331)
+++ trunk/Source/WebKit2/ChangeLog 2015-09-30 00:16:31 UTC (rev 190332)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-09-29 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><ins>+ Followup to "Move WebKit2 AsyncTask to WebCore CrossThreadTask."
+ https://bugs.webkit.org/show_bug.cgi?id=149651
+
+ Rubberstamped by Alex Christensen.
+
+ * DatabaseProcess/DatabaseProcess.h: CrossThreadTask is in the WebCore namespace, not WebKit.
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.h: Ditto.
+
+2015-09-29 Brady Eidson <beidson@apple.com>
+
</ins><span class="cx"> Move WebKit2 AsyncTask to WebCore CrossThreadTask.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149651
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (190331 => 190332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2015-09-29 23:28:22 UTC (rev 190331)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2015-09-30 00:16:31 UTC (rev 190332)
</span><span class="lines">@@ -33,13 +33,13 @@
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+class CrossThreadTask;
</ins><span class="cx"> class SessionID;
</span><span class="cx"> struct SecurityOriginData;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class CrossThreadTask;
</del><span class="cx"> class DatabaseToWebProcessConnection;
</span><span class="cx"> class UniqueIDBDatabase;
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> WorkQueue& queue() { return m_queue.get(); }
</span><span class="cx">
</span><del>- void postDatabaseTask(std::unique_ptr<CrossThreadTask>);
</del><ins>+ void postDatabaseTask(std::unique_ptr<WebCore::CrossThreadTask>);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> DatabaseProcess();
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> HashMap<UniqueIDBDatabaseIdentifier, RefPtr<UniqueIDBDatabase>> m_idbDatabases;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- Deque<std::unique_ptr<CrossThreadTask>> m_databaseTasks;
</del><ins>+ Deque<std::unique_ptr<WebCore::CrossThreadTask>> m_databaseTasks;
</ins><span class="cx"> Lock m_databaseTaskMutex;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h (190331 => 190332)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2015-09-29 23:28:22 UTC (rev 190331)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.h 2015-09-30 00:16:31 UTC (rev 190332)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+class CrossThreadTask;
</ins><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><span class="cx"> struct IDBDatabaseMetadata;
</span><span class="lines">@@ -56,7 +57,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-class CrossThreadTask;
</del><span class="cx"> class DatabaseProcessIDBConnection;
</span><span class="cx"> class UniqueIDBDatabaseBackingStore;
</span><span class="cx">
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> Normal,
</span><span class="cx"> Shutdown
</span><span class="cx"> };
</span><del>- void postDatabaseTask(std::unique_ptr<CrossThreadTask>, DatabaseTaskType = DatabaseTaskType::Normal);
</del><ins>+ void postDatabaseTask(std::unique_ptr<WebCore::CrossThreadTask>, DatabaseTaskType = DatabaseTaskType::Normal);
</ins><span class="cx">
</span><span class="cx"> void shutdown(UniqueIDBDatabaseShutdownType);
</span><span class="cx">
</span><span class="lines">@@ -138,11 +138,11 @@
</span><span class="cx"> // Returns true if this origin can use the same databases as the given origin.
</span><span class="cx"> bool canShareDatabases(const WebCore::SecurityOriginData&, const WebCore::SecurityOriginData&) const;
</span><span class="cx">
</span><del>- void postTransactionOperation(const IDBIdentifier& transactionIdentifier, std::unique_ptr<CrossThreadTask>, std::function<void (bool)> successCallback);
</del><ins>+ void postTransactionOperation(const IDBIdentifier& transactionIdentifier, std::unique_ptr<WebCore::CrossThreadTask>, std::function<void (bool)> successCallback);
</ins><span class="cx">
</span><span class="cx"> // To be called from the database workqueue thread only
</span><span class="cx"> void performNextDatabaseTask();
</span><del>- void postMainThreadTask(std::unique_ptr<CrossThreadTask>, DatabaseTaskType = DatabaseTaskType::Normal);
</del><ins>+ void postMainThreadTask(std::unique_ptr<WebCore::CrossThreadTask>, DatabaseTaskType = DatabaseTaskType::Normal);
</ins><span class="cx"> void openBackingStoreAndReadMetadata(const UniqueIDBDatabaseIdentifier&, const String& databaseDirectory);
</span><span class="cx"> void openBackingStoreTransaction(const IDBIdentifier& transactionIdentifier, const Vector<int64_t>& objectStoreIDs, WebCore::IndexedDB::TransactionMode);
</span><span class="cx"> void beginBackingStoreTransaction(const IDBIdentifier&);
</span><span class="lines">@@ -208,10 +208,10 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<UniqueIDBDatabaseBackingStore> m_backingStore;
</span><span class="cx">
</span><del>- Deque<std::unique_ptr<CrossThreadTask>> m_databaseTasks;
</del><ins>+ Deque<std::unique_ptr<WebCore::CrossThreadTask>> m_databaseTasks;
</ins><span class="cx"> Lock m_databaseTaskMutex;
</span><span class="cx">
</span><del>- Deque<std::unique_ptr<CrossThreadTask>> m_mainThreadTasks;
</del><ins>+ Deque<std::unique_ptr<WebCore::CrossThreadTask>> m_mainThreadTasks;
</ins><span class="cx"> Lock m_mainThreadTaskMutex;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>