<!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>[164255] 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/164255">164255</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-17 16:08:02 -0800 (Mon, 17 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop using isMainThread() in WebKit2
https://bugs.webkit.org/show_bug.cgi?id=128940
<rdar://problem/15963666>
Reviewed by Enrica Casucci.
Since isMainThread() has a different meaning when the web thread is enabled on iOS,
just use RunLoop::isMain() to check if we're executing on the main thread.
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::ensurePathExists):
(WebKit::DatabaseProcess::postDatabaseTask):
(WebKit::DatabaseProcess::performNextDatabaseTask):
* DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
(WebKit::UniqueIDBDatabase::shutdown):
(WebKit::UniqueIDBDatabase::shutdownBackingStore):
(WebKit::UniqueIDBDatabase::didShutdownBackingStore):
(WebKit::UniqueIDBDatabase::deleteDatabase):
(WebKit::UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata):
(WebKit::UniqueIDBDatabase::openBackingStoreAndReadMetadata):
(WebKit::UniqueIDBDatabase::didOpenBackingStoreAndReadMetadata):
(WebKit::UniqueIDBDatabase::postTransactionOperation):
(WebKit::UniqueIDBDatabase::didCompleteTransactionOperation):
(WebKit::UniqueIDBDatabase::changeDatabaseVersion):
(WebKit::UniqueIDBDatabase::createObjectStore):
(WebKit::UniqueIDBDatabase::deleteObjectStore):
(WebKit::UniqueIDBDatabase::clearObjectStore):
(WebKit::UniqueIDBDatabase::createIndex):
(WebKit::UniqueIDBDatabase::deleteIndex):
(WebKit::UniqueIDBDatabase::putRecord):
(WebKit::UniqueIDBDatabase::getRecord):
(WebKit::UniqueIDBDatabase::openCursor):
(WebKit::UniqueIDBDatabase::cursorAdvance):
(WebKit::UniqueIDBDatabase::cursorIterate):
(WebKit::UniqueIDBDatabase::count):
(WebKit::UniqueIDBDatabase::deleteRange):
(WebKit::UniqueIDBDatabase::openBackingStoreTransaction):
(WebKit::UniqueIDBDatabase::beginBackingStoreTransaction):
(WebKit::UniqueIDBDatabase::commitBackingStoreTransaction):
(WebKit::UniqueIDBDatabase::resetBackingStoreTransaction):
(WebKit::UniqueIDBDatabase::rollbackBackingStoreTransaction):
(WebKit::UniqueIDBDatabase::changeDatabaseVersionInBackingStore):
(WebKit::UniqueIDBDatabase::createObjectStoreInBackingStore):
(WebKit::UniqueIDBDatabase::deleteObjectStoreInBackingStore):
(WebKit::UniqueIDBDatabase::clearObjectStoreInBackingStore):
(WebKit::UniqueIDBDatabase::createIndexInBackingStore):
(WebKit::UniqueIDBDatabase::deleteIndexInBackingStore):
(WebKit::UniqueIDBDatabase::putRecordInBackingStore):
(WebKit::UniqueIDBDatabase::getRecordFromBackingStore):
(WebKit::UniqueIDBDatabase::openCursorInBackingStore):
(WebKit::UniqueIDBDatabase::absoluteDatabaseDirectory):
(WebKit::UniqueIDBDatabase::postMainThreadTask):
(WebKit::UniqueIDBDatabase::performNextMainThreadTask):
(WebKit::UniqueIDBDatabase::postDatabaseTask):
(WebKit::UniqueIDBDatabase::performNextDatabaseTask):
* DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
(WebKit::generateDatabaseId):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::UniqueIDBDatabaseBackingStoreSQLite):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::~UniqueIDBDatabaseBackingStoreSQLite):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::extractExistingMetadata):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::openSQLiteDatabaseAtPath):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::getOrEstablishMetadata):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::establishTransaction):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::beginTransaction):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::commitTransaction):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::resetTransaction):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::rollbackTransaction):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::changeDatabaseVersion):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::createObjectStore):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::deleteObjectStore):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::clearObjectStore):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::createIndex):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::deleteIndex):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::generateKeyNumber):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::updateKeyGeneratorNumber):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::keyExistsInObjectStore):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::putRecord):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::putIndexRecord):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::getIndexRecord):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::deleteRecord):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::deleteRange):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::getKeyRecordFromObjectStore):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::getKeyRangeRecordFromObjectStore):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::count):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::openCursor):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::advanceCursor):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::iterateCursor):
(WebKit::UniqueIDBDatabaseBackingStoreSQLite::notifyCursorsOfChanges):
* NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
(WebKit::NetworkBlobRegistry::shared):
* NetworkProcess/HostRecord.cpp:
(WebKit::HostRecord::scheduleResourceLoader):
(WebKit::HostRecord::addLoaderInProgress):
(WebKit::HostRecord::removeLoader):
* NetworkProcess/NetworkResourceLoadScheduler.cpp:
(WebKit::NetworkResourceLoadScheduler::removeLoader):
(WebKit::NetworkResourceLoadScheduler::receivedRedirect):
(WebKit::NetworkResourceLoadScheduler::removeScheduledLoaders):
* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::NetworkResourceLoader):
(WebKit::NetworkResourceLoader::~NetworkResourceLoader):
(WebKit::NetworkResourceLoader::start):
(WebKit::NetworkResourceLoader::cleanup):
(WebKit::NetworkResourceLoader::abort):
(WebKit::NetworkResourceLoader::willSendRequestAsync):
(WebKit::NetworkResourceLoader::canAuthenticateAgainstProtectionSpaceAsync):
* NetworkProcess/NetworkResourceLoader.h:
(WebKit::NetworkResourceLoader::setHostRecord):
(WebKit::NetworkResourceLoader::hostRecord):
* NetworkProcess/mac/DiskCacheMonitor.mm:
(WebKit::DiskCacheMonitor::DiskCacheMonitor):
* Shared/AsyncRequest.cpp:
(WebKit::generateRequestID):
* Shared/Authentication/AuthenticationManager.cpp:
(WebKit::generateAuthenticationChallengeID):
(WebKit::AuthenticationManager::establishIdentifierForChallenge):
(WebKit::AuthenticationManager::useCredentialForChallenge):
(WebKit::AuthenticationManager::continueWithoutCredentialForChallenge):
(WebKit::AuthenticationManager::cancelChallenge):
* Shared/Downloads/mac/DownloadMac.mm:
(dispatchOnMainThread):
* Shared/Plugins/NPObjectProxy.cpp:
(WebKit::NPObjectProxy::~NPObjectProxy):
* Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
(WebKit::getPluginInfoFromCarbonResources):
* Shared/SessionTracker.cpp:
(WebKit::staticSessionMap):
(WebKit::storageSessionToID):
(WebKit::identifierBase):
(WebKit::SessionTracker::destroySession):
(WebKit::SessionTracker::setIdentifierBase):
* UIProcess/APISession.cpp:
(API::generateID):
(API::Session::defaultSession):
(API::Session::legacyPrivateSession):
* WebProcess/Cookies/WebCookieManager.cpp:
(WebKit::WebCookieManager::dispatchCookiesDidChange):
* WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp:
(WebKit::WebIDBFactoryBackend::open):
(WebKit::WebIDBFactoryBackend::deleteDatabase):
* WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
(WebKit::generateServerConnectionIdentifier):
* WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
(WebKit::WebFrameNetworkingContext::storageSession):
* WebProcess/WebPage/EventDispatcher.cpp:
(WebKit::EventDispatcher::dispatchWheelEvent):</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="#trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp">trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp">trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessHostRecordcpp">trunk/Source/WebKit2/NetworkProcess/HostRecord.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadSchedulercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh">trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessmacDiskCacheMonitormm">trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedAsyncRequestcpp">trunk/Source/WebKit2/Shared/AsyncRequest.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAuthenticationAuthenticationManagercpp">trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedDownloadsmacDownloadMacmm">trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNPObjectProxycpp">trunk/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedPluginsNetscapemacNetscapePluginModuleMacmm">trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedSessionTrackercpp">trunk/Source/WebKit2/Shared/SessionTracker.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPISessioncpp">trunk/Source/WebKit2/UIProcess/APISession.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessCookiesWebCookieManagercpp">trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBFactoryBackendcpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContextmm">trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -1,5 +1,155 @@
</span><span class="cx"> 2014-02-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Stop using isMainThread() in WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=128940
+ <rdar://problem/15963666>
+
+ Reviewed by Enrica Casucci.
+
+ Since isMainThread() has a different meaning when the web thread is enabled on iOS,
+ just use RunLoop::isMain() to check if we're executing on the main thread.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::ensurePathExists):
+ (WebKit::DatabaseProcess::postDatabaseTask):
+ (WebKit::DatabaseProcess::performNextDatabaseTask):
+ * DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp:
+ (WebKit::UniqueIDBDatabase::shutdown):
+ (WebKit::UniqueIDBDatabase::shutdownBackingStore):
+ (WebKit::UniqueIDBDatabase::didShutdownBackingStore):
+ (WebKit::UniqueIDBDatabase::deleteDatabase):
+ (WebKit::UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata):
+ (WebKit::UniqueIDBDatabase::openBackingStoreAndReadMetadata):
+ (WebKit::UniqueIDBDatabase::didOpenBackingStoreAndReadMetadata):
+ (WebKit::UniqueIDBDatabase::postTransactionOperation):
+ (WebKit::UniqueIDBDatabase::didCompleteTransactionOperation):
+ (WebKit::UniqueIDBDatabase::changeDatabaseVersion):
+ (WebKit::UniqueIDBDatabase::createObjectStore):
+ (WebKit::UniqueIDBDatabase::deleteObjectStore):
+ (WebKit::UniqueIDBDatabase::clearObjectStore):
+ (WebKit::UniqueIDBDatabase::createIndex):
+ (WebKit::UniqueIDBDatabase::deleteIndex):
+ (WebKit::UniqueIDBDatabase::putRecord):
+ (WebKit::UniqueIDBDatabase::getRecord):
+ (WebKit::UniqueIDBDatabase::openCursor):
+ (WebKit::UniqueIDBDatabase::cursorAdvance):
+ (WebKit::UniqueIDBDatabase::cursorIterate):
+ (WebKit::UniqueIDBDatabase::count):
+ (WebKit::UniqueIDBDatabase::deleteRange):
+ (WebKit::UniqueIDBDatabase::openBackingStoreTransaction):
+ (WebKit::UniqueIDBDatabase::beginBackingStoreTransaction):
+ (WebKit::UniqueIDBDatabase::commitBackingStoreTransaction):
+ (WebKit::UniqueIDBDatabase::resetBackingStoreTransaction):
+ (WebKit::UniqueIDBDatabase::rollbackBackingStoreTransaction):
+ (WebKit::UniqueIDBDatabase::changeDatabaseVersionInBackingStore):
+ (WebKit::UniqueIDBDatabase::createObjectStoreInBackingStore):
+ (WebKit::UniqueIDBDatabase::deleteObjectStoreInBackingStore):
+ (WebKit::UniqueIDBDatabase::clearObjectStoreInBackingStore):
+ (WebKit::UniqueIDBDatabase::createIndexInBackingStore):
+ (WebKit::UniqueIDBDatabase::deleteIndexInBackingStore):
+ (WebKit::UniqueIDBDatabase::putRecordInBackingStore):
+ (WebKit::UniqueIDBDatabase::getRecordFromBackingStore):
+ (WebKit::UniqueIDBDatabase::openCursorInBackingStore):
+ (WebKit::UniqueIDBDatabase::absoluteDatabaseDirectory):
+ (WebKit::UniqueIDBDatabase::postMainThreadTask):
+ (WebKit::UniqueIDBDatabase::performNextMainThreadTask):
+ (WebKit::UniqueIDBDatabase::postDatabaseTask):
+ (WebKit::UniqueIDBDatabase::performNextDatabaseTask):
+ * DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp:
+ (WebKit::generateDatabaseId):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::UniqueIDBDatabaseBackingStoreSQLite):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::~UniqueIDBDatabaseBackingStoreSQLite):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::extractExistingMetadata):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::openSQLiteDatabaseAtPath):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::getOrEstablishMetadata):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::establishTransaction):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::beginTransaction):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::commitTransaction):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::resetTransaction):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::rollbackTransaction):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::changeDatabaseVersion):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::createObjectStore):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::deleteObjectStore):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::clearObjectStore):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::createIndex):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::deleteIndex):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::generateKeyNumber):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::updateKeyGeneratorNumber):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::keyExistsInObjectStore):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::putRecord):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::putIndexRecord):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::getIndexRecord):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::deleteRecord):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::deleteRange):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::getKeyRecordFromObjectStore):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::getKeyRangeRecordFromObjectStore):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::count):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::openCursor):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::advanceCursor):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::iterateCursor):
+ (WebKit::UniqueIDBDatabaseBackingStoreSQLite::notifyCursorsOfChanges):
+ * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
+ (WebKit::NetworkBlobRegistry::shared):
+ * NetworkProcess/HostRecord.cpp:
+ (WebKit::HostRecord::scheduleResourceLoader):
+ (WebKit::HostRecord::addLoaderInProgress):
+ (WebKit::HostRecord::removeLoader):
+ * NetworkProcess/NetworkResourceLoadScheduler.cpp:
+ (WebKit::NetworkResourceLoadScheduler::removeLoader):
+ (WebKit::NetworkResourceLoadScheduler::receivedRedirect):
+ (WebKit::NetworkResourceLoadScheduler::removeScheduledLoaders):
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::NetworkResourceLoader):
+ (WebKit::NetworkResourceLoader::~NetworkResourceLoader):
+ (WebKit::NetworkResourceLoader::start):
+ (WebKit::NetworkResourceLoader::cleanup):
+ (WebKit::NetworkResourceLoader::abort):
+ (WebKit::NetworkResourceLoader::willSendRequestAsync):
+ (WebKit::NetworkResourceLoader::canAuthenticateAgainstProtectionSpaceAsync):
+ * NetworkProcess/NetworkResourceLoader.h:
+ (WebKit::NetworkResourceLoader::setHostRecord):
+ (WebKit::NetworkResourceLoader::hostRecord):
+ * NetworkProcess/mac/DiskCacheMonitor.mm:
+ (WebKit::DiskCacheMonitor::DiskCacheMonitor):
+ * Shared/AsyncRequest.cpp:
+ (WebKit::generateRequestID):
+ * Shared/Authentication/AuthenticationManager.cpp:
+ (WebKit::generateAuthenticationChallengeID):
+ (WebKit::AuthenticationManager::establishIdentifierForChallenge):
+ (WebKit::AuthenticationManager::useCredentialForChallenge):
+ (WebKit::AuthenticationManager::continueWithoutCredentialForChallenge):
+ (WebKit::AuthenticationManager::cancelChallenge):
+ * Shared/Downloads/mac/DownloadMac.mm:
+ (dispatchOnMainThread):
+ * Shared/Plugins/NPObjectProxy.cpp:
+ (WebKit::NPObjectProxy::~NPObjectProxy):
+ * Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm:
+ (WebKit::getPluginInfoFromCarbonResources):
+ * Shared/SessionTracker.cpp:
+ (WebKit::staticSessionMap):
+ (WebKit::storageSessionToID):
+ (WebKit::identifierBase):
+ (WebKit::SessionTracker::destroySession):
+ (WebKit::SessionTracker::setIdentifierBase):
+ * UIProcess/APISession.cpp:
+ (API::generateID):
+ (API::Session::defaultSession):
+ (API::Session::legacyPrivateSession):
+ * WebProcess/Cookies/WebCookieManager.cpp:
+ (WebKit::WebCookieManager::dispatchCookiesDidChange):
+ * WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp:
+ (WebKit::WebIDBFactoryBackend::open):
+ (WebKit::WebIDBFactoryBackend::deleteDatabase):
+ * WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp:
+ (WebKit::generateServerConnectionIdentifier):
+ * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
+ (WebKit::WebFrameNetworkingContext::storageSession):
+ * WebProcess/WebPage/EventDispatcher.cpp:
+ (WebKit::EventDispatcher::dispatchWheelEvent):
+
+2014-02-17 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Remove view source code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127233
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseProcess::ensurePathExists(const String& path)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!makeAllDirectories(path))
</span><span class="cx"> LOG_ERROR("Failed to make all directories for path '%s'", path.utf8().data());
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseProcess::postDatabaseTask(std::unique_ptr<AsyncTask> task)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> MutexLocker locker(m_databaseTaskMutex);
</span><span class="cx">
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> void DatabaseProcess::performNextDatabaseTask()
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<AsyncTask> task;
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/UniqueIDBDatabase.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::shutdown(UniqueIDBDatabaseShutdownType type)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests)
</span><span class="cx"> return;
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::shutdownBackingStore(UniqueIDBDatabaseShutdownType type, const String& databaseDirectory)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> m_backingStore.clear();
</span><span class="cx">
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didShutdownBackingStore(UniqueIDBDatabaseShutdownType type)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> // Balanced by a ref in ::shutdown()
</span><span class="cx"> RefPtr<UniqueIDBDatabase> protector(adoptRef(this));
</span><span class="lines">@@ -184,7 +184,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::deleteDatabase(std::function<void(bool)> successCallback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> // Someone else has already shutdown this database, so we can't request a delete.
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::getOrEstablishIDBDatabaseMetadata(std::function<void(bool, const IDBDatabaseMetadata&)> completionCallback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> completionCallback(false, IDBDatabaseMetadata());
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::openBackingStoreAndReadMetadata(const UniqueIDBDatabaseIdentifier& identifier, const String& databaseDirectory)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(!m_backingStore);
</span><span class="cx">
</span><span class="cx"> if (m_inMemory) {
</span><span class="lines">@@ -263,7 +263,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didOpenBackingStoreAndReadMetadata(const IDBDatabaseMetadata& metadata, bool success)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> ASSERT(!m_metadata);
</span><span class="cx">
</span><span class="cx"> m_didGetMetadataFromBackingStore = true;
</span><span class="lines">@@ -304,7 +304,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::postTransactionOperation(const IDBIdentifier& transactionIdentifier, std::unique_ptr<AsyncTask> task, std::function<void(bool)> successCallback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> successCallback(false);
</span><span class="lines">@@ -330,7 +330,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::didCompleteTransactionOperation(const IDBIdentifier& transactionIdentifier, bool success)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> RefPtr<AsyncRequest> request = m_pendingTransactionRequests.take(transactionIdentifier);
</span><span class="cx"> if (!request)
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::changeDatabaseVersion(const IDBIdentifier& transactionIdentifier, uint64_t newVersion, std::function<void(bool)> successCallback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> successCallback(false);
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::createObjectStore(const IDBIdentifier& transactionIdentifier, const IDBObjectStoreMetadata& metadata, std::function<void(bool)> successCallback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> successCallback(false);
</span><span class="lines">@@ -434,7 +434,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::deleteObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, std::function<void(bool)> successCallback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> successCallback(false);
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::clearObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, std::function<void(bool)> successCallback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> successCallback(false);
</span><span class="lines">@@ -484,7 +484,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::createIndex(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBIndexMetadata& metadata, std::function<void(bool)> successCallback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> successCallback(false);
</span><span class="lines">@@ -518,7 +518,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::deleteIndex(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, std::function<void(bool)> successCallback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> successCallback(false);
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::putRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBKeyData& keyData, const IPC::DataReference& value, int64_t putMode, const Vector<int64_t>& indexIDs, const Vector<Vector<IDBKeyData>>& indexKeys, std::function<void(const IDBKeyData&, uint32_t, const String&)> callback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> callback(IDBKeyData(), INVALID_STATE_ERR, "Unable to put record into database because it has shut down");
</span><span class="lines">@@ -575,7 +575,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::getRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const IDBKeyRangeData& keyRangeData, IndexedDB::CursorType cursorType, std::function<void(const IDBGetResult&, uint32_t, const String&)> callback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> callback(IDBGetResult(), INVALID_STATE_ERR, "Unable to get record from database because it has shut down");
</span><span class="lines">@@ -598,7 +598,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::openCursor(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, IndexedDB::CursorDirection cursorDirection, IndexedDB::CursorType cursorType, IDBDatabaseBackend::TaskType taskType, const IDBKeyRangeData& keyRangeData, std::function<void(int64_t, const IDBKeyData&, const IDBKeyData&, PassRefPtr<SharedBuffer>, uint32_t, const String&)> callback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> callback(0, nullptr, nullptr, nullptr, INVALID_STATE_ERR, "Unable to open cursor in database because it has shut down");
</span><span class="lines">@@ -621,7 +621,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::cursorAdvance(const IDBIdentifier& cursorIdentifier, uint64_t count, std::function<void(const IDBKeyData&, const IDBKeyData&, PassRefPtr<SharedBuffer>, uint32_t, const String&)> callback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> callback(nullptr, nullptr, nullptr, INVALID_STATE_ERR, "Unable to advance cursor in database because it has shut down");
</span><span class="lines">@@ -642,7 +642,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::cursorIterate(const IDBIdentifier& cursorIdentifier, const IDBKeyData& key, std::function<void(const IDBKeyData&, const IDBKeyData&, PassRefPtr<SharedBuffer>, uint32_t, const String&)> callback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> callback(nullptr, nullptr, nullptr, INVALID_STATE_ERR, "Unable to iterate cursor in database because it has shut down");
</span><span class="lines">@@ -663,7 +663,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::count(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const IDBKeyRangeData& keyRangeData, std::function<void(int64_t, uint32_t, const String&)> callback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> callback(0, INVALID_STATE_ERR, "Unable to get count from database because it has shut down");
</span><span class="lines">@@ -684,7 +684,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::deleteRange(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBKeyRangeData& keyRangeData, std::function<void(uint32_t, const String&)> callback)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests) {
</span><span class="cx"> callback(INVALID_STATE_ERR, "Unable to deleteRange from database because it has shut down");
</span><span class="lines">@@ -705,7 +705,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::openBackingStoreTransaction(const IDBIdentifier& transactionIdentifier, const Vector<int64_t>& objectStoreIDs, IndexedDB::TransactionMode mode)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->establishTransaction(transactionIdentifier, objectStoreIDs, mode);
</span><span class="lines">@@ -715,7 +715,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::beginBackingStoreTransaction(const IDBIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->beginTransaction(transactionIdentifier);
</span><span class="lines">@@ -725,7 +725,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::commitBackingStoreTransaction(const IDBIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->commitTransaction(transactionIdentifier);
</span><span class="lines">@@ -735,7 +735,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::resetBackingStoreTransaction(const IDBIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->resetTransaction(transactionIdentifier);
</span><span class="lines">@@ -745,7 +745,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::rollbackBackingStoreTransaction(const IDBIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->rollbackTransaction(transactionIdentifier);
</span><span class="lines">@@ -755,7 +755,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::changeDatabaseVersionInBackingStore(uint64_t requestID, const IDBIdentifier& transactionIdentifier, uint64_t newVersion)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->changeDatabaseVersion(transactionIdentifier, newVersion);
</span><span class="lines">@@ -765,7 +765,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::createObjectStoreInBackingStore(uint64_t requestID, const IDBIdentifier& transactionIdentifier, const IDBObjectStoreMetadata& metadata)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->createObjectStore(transactionIdentifier, metadata);
</span><span class="lines">@@ -775,7 +775,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::deleteObjectStoreInBackingStore(uint64_t requestID, const IDBIdentifier& transactionIdentifier, int64_t objectStoreID)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->deleteObjectStore(transactionIdentifier, objectStoreID);
</span><span class="lines">@@ -785,7 +785,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::clearObjectStoreInBackingStore(uint64_t requestID, const IDBIdentifier& transactionIdentifier, int64_t objectStoreID)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->clearObjectStore(transactionIdentifier, objectStoreID);
</span><span class="lines">@@ -795,7 +795,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::createIndexInBackingStore(uint64_t requestID, const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBIndexMetadata& metadata)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->createIndex(transactionIdentifier, objectStoreID, metadata);
</span><span class="lines">@@ -805,7 +805,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::deleteIndexInBackingStore(uint64_t requestID, const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> bool success = m_backingStore->deleteIndex(transactionIdentifier, objectStoreID, indexID);
</span><span class="lines">@@ -815,7 +815,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::putRecordInBackingStore(uint64_t requestID, const IDBIdentifier& transaction, const IDBObjectStoreMetadata& objectStoreMetadata, const IDBKeyData& inputKeyData, const Vector<uint8_t>& value, int64_t putMode, const Vector<int64_t>& indexIDs, const Vector<Vector<IDBKeyData>>& indexKeys)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> bool keyWasGenerated = false;
</span><span class="lines">@@ -888,7 +888,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::getRecordFromBackingStore(uint64_t requestID, const IDBIdentifier& transaction, const IDBObjectStoreMetadata& objectStoreMetadata, int64_t indexID, const IDBKeyRangeData& keyRangeData, IndexedDB::CursorType cursorType)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBKeyRange> keyRange = keyRangeData.maybeCreateIDBKeyRange();
</span><span class="lines">@@ -949,7 +949,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::openCursorInBackingStore(uint64_t requestID, const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, IndexedDB::CursorDirection cursorDirection, IndexedDB::CursorType cursorType, IDBDatabaseBackend::TaskType taskType, const IDBKeyRangeData& keyRange)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_backingStore);
</span><span class="cx">
</span><span class="cx"> int64_t cursorID = 0;
</span><span class="lines">@@ -1068,13 +1068,13 @@
</span><span class="cx">
</span><span class="cx"> String UniqueIDBDatabase::absoluteDatabaseDirectory() const
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> return DatabaseProcess::shared().absoluteIndexedDatabasePathFromDatabaseRelativePath(m_databaseRelativeDirectory);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::postMainThreadTask(std::unique_ptr<AsyncTask> task, DatabaseTaskType taskType)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests && taskType == DatabaseTaskType::Normal)
</span><span class="cx"> return;
</span><span class="lines">@@ -1090,7 +1090,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::performNextMainThreadTask()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> // Balanced by a ref() in ::postMainThreadTask
</span><span class="cx"> RefPtr<UniqueIDBDatabase> protector(adoptRef(this));
</span><span class="lines">@@ -1121,7 +1121,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::postDatabaseTask(std::unique_ptr<AsyncTask> task, DatabaseTaskType taskType)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_acceptingNewRequests && taskType == DatabaseTaskType::Normal)
</span><span class="cx"> return;
</span><span class="lines">@@ -1135,7 +1135,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabase::performNextDatabaseTask()
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> // It is possible that this database might be shutting down on the main thread.
</span><span class="cx"> // In this case, immediately after releasing m_databaseTaskMutex, this database might get deleted.
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessIndexedDBsqliteUniqueIDBDatabaseBackingStoreSQLitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/DatabaseProcess/IndexedDB/sqlite/UniqueIDBDatabaseBackingStoreSQLite.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> #include <WebCore/SQLiteDatabase.h>
</span><span class="cx"> #include <WebCore/SQLiteStatement.h>
</span><span class="cx"> #include <WebCore/SharedBuffer.h>
</span><del>-#include <wtf/MainThread.h>
</del><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx">
</span><span class="cx"> using namespace JSC;
</span><span class="cx"> using namespace WebCore;
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx"> {
</span><span class="cx"> static int64_t databaseID = 0;
</span><span class="cx">
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> return ++databaseID;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -66,12 +66,12 @@
</span><span class="cx"> , m_absoluteDatabaseDirectory(databaseDirectory)
</span><span class="cx"> {
</span><span class="cx"> // The backing store is meant to be created and used entirely on a background thread.
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> UniqueIDBDatabaseBackingStoreSQLite::~UniqueIDBDatabaseBackingStoreSQLite()
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> m_transactions.clear();
</span><span class="cx"> m_sqliteDB = nullptr;
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<IDBDatabaseMetadata> UniqueIDBDatabaseBackingStoreSQLite::createAndPopulateInitialMetadata()
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -175,7 +175,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<IDBDatabaseMetadata> UniqueIDBDatabaseBackingStoreSQLite::extractExistingMetadata()
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx">
</span><span class="cx"> if (!m_sqliteDB->tableExists(ASCIILiteral("IDBDatabaseInfo")))
</span><span class="lines">@@ -289,7 +289,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<SQLiteDatabase> UniqueIDBDatabaseBackingStoreSQLite::openSQLiteDatabaseAtPath(const String& path)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> auto sqliteDatabase = std::make_unique<SQLiteDatabase>();
</span><span class="cx"> if (!sqliteDatabase->open(path)) {
</span><span class="lines">@@ -306,7 +306,7 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<IDBDatabaseMetadata> UniqueIDBDatabaseBackingStoreSQLite::getOrEstablishMetadata()
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> String dbFilename = UniqueIDBDatabase::calculateAbsoluteDatabaseFilename(m_absoluteDatabaseDirectory);
</span><span class="cx">
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::establishTransaction(const IDBIdentifier& transactionIdentifier, const Vector<int64_t>&, IndexedDB::TransactionMode mode)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_transactions.add(transactionIdentifier, SQLiteIDBTransaction::create(*this, transactionIdentifier, mode)).isNewEntry) {
</span><span class="cx"> LOG_ERROR("Attempt to establish transaction identifier that already exists");
</span><span class="lines">@@ -345,7 +345,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::beginTransaction(const IDBIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> SQLiteIDBTransaction* transaction = m_transactions.get(transactionIdentifier);
</span><span class="cx"> if (!transaction) {
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::commitTransaction(const IDBIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> SQLiteIDBTransaction* transaction = m_transactions.get(transactionIdentifier);
</span><span class="cx"> if (!transaction) {
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::resetTransaction(const IDBIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> std::unique_ptr<SQLiteIDBTransaction> transaction = m_transactions.take(transactionIdentifier);
</span><span class="cx"> if (!transaction) {
</span><span class="lines">@@ -384,7 +384,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::rollbackTransaction(const IDBIdentifier& transactionIdentifier)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> SQLiteIDBTransaction* transaction = m_transactions.get(transactionIdentifier);
</span><span class="cx"> if (!transaction) {
</span><span class="lines">@@ -397,7 +397,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::changeDatabaseVersion(const IDBIdentifier& transactionIdentifier, uint64_t newVersion)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::createObjectStore(const IDBIdentifier& transactionIdentifier, const IDBObjectStoreMetadata& metadata)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -475,7 +475,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::deleteObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -549,7 +549,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::clearObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -588,7 +588,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::createIndex(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBIndexMetadata& metadata)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -670,7 +670,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::deleteIndex(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::generateKeyNumber(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t& generatedKey)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -754,7 +754,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::updateKeyGeneratorNumber(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t keyNumber, bool)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -784,7 +784,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::keyExistsInObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBKeyData& keyData, bool& keyExists)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::putRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBKeyData& keyData, const uint8_t* valueBuffer, size_t valueSize)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -864,7 +864,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::putIndexRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const IDBKeyData& keyValue, const IDBKeyData& indexKey)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -912,7 +912,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::getIndexRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const IDBKeyRangeData& keyRangeData, IndexedDB::CursorType cursorType, IDBGetResult& result)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -947,7 +947,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::deleteRecord(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const WebCore::IDBKeyData& keyData)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -967,7 +967,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::deleteRange(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBKeyRangeData& keyRangeData)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -1028,7 +1028,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::deleteRecord(SQLiteIDBTransaction& transaction, int64_t objectStoreID, const WebCore::IDBKeyData& key)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -1069,7 +1069,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::getKeyRecordFromObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBKey& key, RefPtr<SharedBuffer>& result)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -1115,7 +1115,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::getKeyRangeRecordFromObjectStore(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, const IDBKeyRange& keyRange, RefPtr<SharedBuffer>& result, RefPtr<IDBKey>& resultKey)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -1169,7 +1169,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::count(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, const IDBKeyRangeData& keyRangeData, int64_t& count)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -1199,7 +1199,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::openCursor(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID, int64_t indexID, IndexedDB::CursorDirection cursorDirection, IndexedDB::CursorType cursorType, IDBDatabaseBackend::TaskType taskType, const IDBKeyRangeData& keyRange, int64_t& cursorID, IDBKeyData& key, IDBKeyData& primaryKey, Vector<uint8_t>& valueBuffer)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -1224,7 +1224,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::advanceCursor(const IDBIdentifier& cursorIdentifier, uint64_t count, IDBKeyData& key, IDBKeyData& primaryKey, Vector<uint8_t>& valueBuffer)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -1252,7 +1252,7 @@
</span><span class="cx">
</span><span class="cx"> bool UniqueIDBDatabaseBackingStoreSQLite::iterateCursor(const IDBIdentifier& cursorIdentifier, const IDBKeyData& targetKey, IDBKeyData& key, IDBKeyData& primaryKey, Vector<uint8_t>& valueBuffer)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span><span class="lines">@@ -1280,7 +1280,7 @@
</span><span class="cx">
</span><span class="cx"> void UniqueIDBDatabaseBackingStoreSQLite::notifyCursorsOfChanges(const IDBIdentifier& transactionIdentifier, int64_t objectStoreID)
</span><span class="cx"> {
</span><del>- ASSERT(!isMainThread());
</del><ins>+ ASSERT(!RunLoop::isMain());
</ins><span class="cx"> ASSERT(m_sqliteDB);
</span><span class="cx"> ASSERT(m_sqliteDB->isOpen());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -30,8 +30,8 @@
</span><span class="cx">
</span><span class="cx"> #include "SandboxExtension.h"
</span><span class="cx"> #include <WebCore/BlobRegistryImpl.h>
</span><del>-#include <wtf/MainThread.h>
</del><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx">
</span><span class="cx"> NetworkBlobRegistry& NetworkBlobRegistry::shared()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> static NeverDestroyed<NetworkBlobRegistry> registry;
</span><span class="cx"> return registry;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessHostRecordcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/HostRecord.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/HostRecord.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/NetworkProcess/HostRecord.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> void HostRecord::scheduleResourceLoader(PassRefPtr<NetworkResourceLoader> loader)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> loader->setHostRecord(this);
</span><span class="cx">
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> void HostRecord::addLoaderInProgress(NetworkResourceLoader* loader)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> m_loadersInProgress.add(loader);
</span><span class="cx"> loader->setHostRecord(this);
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> void HostRecord::removeLoader(NetworkResourceLoader* loader)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> // FIXME (NetworkProcess): Due to IPC race conditions, it's possible this HostRecord will be asked to remove the same loader twice.
</span><span class="cx"> // It would be nice to know the loader has already been removed and treat it as a no-op.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoadScheduler.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoadScheduler::removeLoader(NetworkResourceLoader* loader)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> ASSERT(loader);
</span><span class="cx">
</span><span class="cx"> LOG(NetworkScheduling, "(NetworkProcess) NetworkResourceLoadScheduler::removeLoadIdentifier removing loader %s", loader->request().url().string().utf8().data());
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoadScheduler::receivedRedirect(NetworkResourceLoader* loader, const WebCore::URL& redirectURL)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> LOG(NetworkScheduling, "(NetworkProcess) NetworkResourceLoadScheduler::receivedRedirect loader originally for '%s' redirected to '%s'", loader->request().url().string().utf8().data(), redirectURL.string().utf8().data());
</span><span class="cx">
</span><span class="cx"> HostRecord* oldHost = loader->hostRecord();
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoadScheduler::removeScheduledLoaders(void* context)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> ASSERT(removeScheduledLoadersCalled);
</span><span class="cx">
</span><span class="cx"> NetworkResourceLoadScheduler* scheduler = static_cast<NetworkResourceLoadScheduler*>(context);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> if (RefPtr<SandboxExtension> resourceSandboxExtension = SandboxExtension::create(parameters.resourceSandboxExtension))
</span><span class="cx"> m_resourceSandboxExtensions.append(resourceSandboxExtension);
</span><span class="cx">
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (reply)
</span><span class="cx"> m_networkLoaderClient = std::make_unique<SynchronousNetworkLoaderClient>(m_request, reply);
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">
</span><span class="cx"> NetworkResourceLoader::~NetworkResourceLoader()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> ASSERT(!m_handle);
</span><span class="cx"> ASSERT(!m_hostRecord);
</span><span class="cx"> }
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::start()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> // Explicit ref() balanced by a deref() in NetworkResourceLoader::resourceHandleStopped()
</span><span class="cx"> ref();
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::cleanup()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> invalidateSandboxExtensions();
</span><span class="cx">
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx">
</span><span class="cx"> void NetworkResourceLoader::abort()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (m_handle && !m_handleConvertedToDownload)
</span><span class="cx"> m_handle->cancel();
</span><span class="lines">@@ -233,7 +233,7 @@
</span><span class="cx">
</span><span class="cx"> // We only expect to get the willSendRequest callback from ResourceHandle as the result of a redirect.
</span><span class="cx"> ASSERT(!redirectResponse.isNull());
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> ResourceRequest proposedRequest = request;
</span><span class="cx"> m_suggestedRequestForWillSendRequest = request;
</span><span class="lines">@@ -378,7 +378,7 @@
</span><span class="cx"> #if USE(PROTECTION_SPACE_AUTH_CALLBACK)
</span><span class="cx"> void NetworkResourceLoader::canAuthenticateAgainstProtectionSpaceAsync(ResourceHandle* handle, const ProtectionSpace& protectionSpace)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> ASSERT_UNUSED(handle, handle == m_handle);
</span><span class="cx">
</span><span class="cx"> m_networkLoaderClient->canAuthenticateAgainstProtectionSpace(this, protectionSpace);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -121,8 +121,8 @@
</span><span class="cx"> bool isSynchronous() const;
</span><span class="cx"> bool isLoadingMainResource() const { return m_isLoadingMainResource; }
</span><span class="cx">
</span><del>- void setHostRecord(HostRecord* hostRecord) { ASSERT(isMainThread()); m_hostRecord = hostRecord; }
- HostRecord* hostRecord() const { ASSERT(isMainThread()); return m_hostRecord.get(); }
</del><ins>+ void setHostRecord(HostRecord* hostRecord) { ASSERT(RunLoop::isMain()); m_hostRecord = hostRecord; }
+ HostRecord* hostRecord() const { ASSERT(RunLoop::isMain()); return m_hostRecord.get(); }
</ins><span class="cx">
</span><span class="cx"> template<typename T>
</span><span class="cx"> bool sendAbortingOnFailure(T&& message, unsigned messageSendFlags = 0)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessmacDiskCacheMonitormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/NetworkProcess/mac/DiskCacheMonitor.mm 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> : m_connectionToWebProcess(loader->connectionToWebProcess())
</span><span class="cx"> , m_resourceRequest(loader->request())
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> // Set up a delayed callback to cancel this monitor if the resource hasn't been cached yet.
</span><span class="cx"> __block DiskCacheMonitor* rawMonitor = this;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAsyncRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/AsyncRequest.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/AsyncRequest.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/Shared/AsyncRequest.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -27,13 +27,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "AsyncRequest.h"
</span><span class="cx">
</span><del>-#include <wtf/MainThread.h>
</del><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> static uint64_t generateRequestID()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> static uint64_t requestID = 0;
</span><span class="cx"> return ++requestID;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAuthenticationAuthenticationManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> static uint64_t generateAuthenticationChallengeID()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> static int64_t uniqueAuthenticationChallengeID;
</span><span class="cx"> return ++uniqueAuthenticationChallengeID;
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t AuthenticationManager::establishIdentifierForChallenge(const WebCore::AuthenticationChallenge& authenticationChallenge)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> uint64_t challengeID = generateAuthenticationChallengeID();
</span><span class="cx"> m_challenges.set(challengeID, authenticationChallenge);
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">
</span><span class="cx"> void AuthenticationManager::useCredentialForChallenge(uint64_t challengeID, const Credential& credential, const CertificateInfo& certificateInfo)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> AuthenticationChallenge challenge = m_challenges.take(challengeID);
</span><span class="cx"> ASSERT(!challenge.isNull());
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx">
</span><span class="cx"> void AuthenticationManager::continueWithoutCredentialForChallenge(uint64_t challengeID)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> AuthenticationChallenge challenge = m_challenges.take(challengeID);
</span><span class="cx"> ASSERT(!challenge.isNull());
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx">
</span><span class="cx"> void AuthenticationManager::cancelChallenge(uint64_t challengeID)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> AuthenticationChallenge challenge = m_challenges.take(challengeID);
</span><span class="cx"> ASSERT(!challenge.isNull());
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedDownloadsmacDownloadMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/Shared/Downloads/mac/DownloadMac.mm 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx"> // FIXME: It would be nice if these callbacks wouldn't have to be invoked on the main thread.
</span><span class="cx"> static void dispatchOnMainThread(void (^block)())
</span><span class="cx"> {
</span><del>- if (isMainThread()) {
</del><ins>+ if (RunLoop::isMain()) {
</ins><span class="cx"> block();
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNPObjectProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/Shared/Plugins/NPObjectProxy.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> NPObjectProxy::~NPObjectProxy()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (!m_npRemoteObjectMap)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedPluginsNetscapemacNetscapePluginModuleMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/Shared/Plugins/Netscape/mac/NetscapePluginModuleMac.mm 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx">
</span><span class="cx"> static bool getPluginInfoFromCarbonResources(CFBundleRef bundle, PluginModuleInfo& plugin)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> ResourceMap resourceMap(bundle);
</span><span class="cx"> if (!resourceMap.isValid())
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedSessionTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SessionTracker.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/SessionTracker.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/Shared/SessionTracker.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SessionTracker.h"
</span><span class="cx">
</span><del>-#include <wtf/MainThread.h>
</del><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> static HashMap<uint64_t, std::unique_ptr<NetworkStorageSession>>& staticSessionMap()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> static NeverDestroyed<HashMap<uint64_t, std::unique_ptr<NetworkStorageSession>>> map;
</span><span class="cx"> return map.get();
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx">
</span><span class="cx"> static HashMap<const NetworkStorageSession*, uint64_t>& storageSessionToID()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> static NeverDestroyed<HashMap<const NetworkStorageSession*, uint64_t>> map;
</span><span class="cx"> return map.get();
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> static String& identifierBase()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> static NeverDestroyed<String> base;
</span><span class="cx"> return base;
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx">
</span><span class="cx"> void SessionTracker::destroySession(uint64_t sessionID)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> if (staticSessionMap().contains(sessionID)) {
</span><span class="cx"> storageSessionToID().remove(session(sessionID));
</span><span class="cx"> staticSessionMap().remove(sessionID);
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">
</span><span class="cx"> void SessionTracker::setIdentifierBase(const String& identifier)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> identifierBase() = identifier;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPISessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/APISession.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/APISession.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/UIProcess/APISession.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -26,13 +26,13 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "APISession.h"
</span><span class="cx">
</span><del>-#include <wtf/MainThread.h>
</del><ins>+#include <wtf/RunLoop.h>
</ins><span class="cx">
</span><span class="cx"> namespace API {
</span><span class="cx">
</span><span class="cx"> static uint64_t generateID(bool isEphemeral)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> static uint64_t uniqueSessionID = WebKit::SessionTracker::legacyPrivateSessionID;
</span><span class="cx"> ASSERT(isEphemeral);
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> Session& Session::defaultSession()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> static Session* defaultSession = new Session(false, WebKit::SessionTracker::defaultSessionID);
</span><span class="cx"> return *defaultSession;
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">
</span><span class="cx"> Session& Session::legacyPrivateSession()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> static Session* legacyPrivateSession = new Session(true, WebKit::SessionTracker::legacyPrivateSessionID);
</span><span class="cx"> return *legacyPrivateSession;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessCookiesWebCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">
</span><span class="cx"> void WebCookieManager::dispatchCookiesDidChange()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> m_process->send(Messages::WebCookieManagerProxy::CookiesDidChange(), 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBFactoryBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx">
</span><span class="cx"> void WebIDBFactoryBackend::open(const String& databaseName, uint64_t version, int64_t transactionId, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<IDBDatabaseCallbacks> databaseCallbacks, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> LOG(IDB, "WebIDBFactoryBackend::open");
</span><span class="cx">
</span><span class="cx"> String databaseIdentifier = uniqueDatabaseIdentifier(databaseName, openingOrigin, mainFrameOrigin);
</span><span class="lines">@@ -149,7 +149,7 @@
</span><span class="cx">
</span><span class="cx"> void WebIDBFactoryBackend::deleteDatabase(const String& databaseName, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin, PassRefPtr<IDBCallbacks> callbacks, ScriptExecutionContext*, const String&)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> LOG(IDB, "WebIDBFactoryBackend::deleteDatabase");
</span><span class="cx">
</span><span class="cx"> String databaseIdentifier = uniqueDatabaseIdentifier(databaseName, openingOrigin, mainFrameOrigin);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBServerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBServerConnection.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> static uint64_t generateServerConnectionIdentifier()
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx"> static uint64_t identifier = 0;
</span><span class="cx"> return ++identifier;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportmacWebFrameNetworkingContextmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -100,7 +100,7 @@
</span><span class="cx">
</span><span class="cx"> NetworkStorageSession& WebFrameNetworkingContext::storageSession() const
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> if (frame())
</span><span class="cx"> return *SessionTracker::session(webFrameLoaderClient()->webFrame()->page()->sessionID());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (164254 => 164255)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2014-02-17 23:53:29 UTC (rev 164254)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2014-02-18 00:08:02 UTC (rev 164255)
</span><span class="lines">@@ -145,7 +145,7 @@
</span><span class="cx">
</span><span class="cx"> void EventDispatcher::dispatchWheelEvent(uint64_t pageID, const WebWheelEvent& wheelEvent)
</span><span class="cx"> {
</span><del>- ASSERT(isMainThread());
</del><ins>+ ASSERT(RunLoop::isMain());
</ins><span class="cx">
</span><span class="cx"> WebPage* webPage = WebProcess::shared().webPage(pageID);
</span><span class="cx"> if (!webPage)
</span></span></pre>
</div>
</div>
</body>
</html>