<!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>[208499] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/208499">208499</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-11-09 15:28:12 -0800 (Wed, 09 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Clean up Storage code
https://bugs.webkit.org/show_bug.cgi?id=164562
Reviewed by Brady Eidson.
Source/WebKit:
Some classes were in WebCore namespace instead of WebKit.
* Storage/StorageAreaImpl.cpp:
(WebKit::StorageAreaImpl::StorageAreaImpl):
(WebKit::StorageAreaImpl::create):
(WebKit::StorageAreaImpl::copy):
(WebCore::StorageAreaImpl::~StorageAreaImpl): Deleted.
(WebCore::StorageAreaImpl::StorageAreaImpl): Deleted.
(WebCore::StorageAreaImpl::create): Deleted.
(WebCore::StorageAreaImpl::copy): Deleted.
(WebCore::StorageAreaImpl::canAccessStorage): Deleted.
(WebCore::StorageAreaImpl::storageType): Deleted.
(WebCore::StorageAreaImpl::length): Deleted.
(WebCore::StorageAreaImpl::key): Deleted.
(WebCore::StorageAreaImpl::item): Deleted.
(WebCore::StorageAreaImpl::setItem): Deleted.
(WebCore::StorageAreaImpl::removeItem): Deleted.
(WebCore::StorageAreaImpl::clear): Deleted.
(WebCore::StorageAreaImpl::contains): Deleted.
(WebCore::StorageAreaImpl::importItems): Deleted.
(WebCore::StorageAreaImpl::close): Deleted.
(WebCore::StorageAreaImpl::clearForOriginDeletion): Deleted.
(WebCore::StorageAreaImpl::sync): Deleted.
(WebCore::StorageAreaImpl::blockUntilImportComplete): Deleted.
(WebCore::StorageAreaImpl::memoryBytesUsedByCache): Deleted.
(WebCore::StorageAreaImpl::incrementAccessCount): Deleted.
(WebCore::StorageAreaImpl::decrementAccessCount): Deleted.
(WebCore::StorageAreaImpl::closeDatabaseTimerFired): Deleted.
(WebCore::StorageAreaImpl::closeDatabaseIfIdle): Deleted.
(WebCore::StorageAreaImpl::dispatchStorageEvent): Deleted.
* Storage/StorageAreaImpl.h:
* Storage/StorageAreaSync.cpp:
(WebKit::StorageAreaSync::StorageAreaSync):
(WebKit::StorageAreaSync::create):
(WebCore::StorageAreaSync::StorageAreaSync): Deleted.
(WebCore::StorageAreaSync::create): Deleted.
(WebCore::StorageAreaSync::~StorageAreaSync): Deleted.
(WebCore::StorageAreaSync::scheduleFinalSync): Deleted.
(WebCore::StorageAreaSync::scheduleItemForSync): Deleted.
(WebCore::StorageAreaSync::scheduleClear): Deleted.
(WebCore::StorageAreaSync::scheduleCloseDatabase): Deleted.
(WebCore::StorageAreaSync::syncTimerFired): Deleted.
(WebCore::StorageAreaSync::openDatabase): Deleted.
(WebCore::StorageAreaSync::migrateItemTableIfNeeded): Deleted.
(WebCore::StorageAreaSync::performImport): Deleted.
(WebCore::StorageAreaSync::markImported): Deleted.
(WebCore::StorageAreaSync::blockUntilImportComplete): Deleted.
(WebCore::StorageAreaSync::sync): Deleted.
(WebCore::StorageAreaSync::performSync): Deleted.
(WebCore::StorageAreaSync::deleteEmptyDatabase): Deleted.
(WebCore::StorageAreaSync::scheduleSync): Deleted.
* Storage/StorageAreaSync.h:
* Storage/StorageNamespaceImpl.cpp:
(WebKit::StorageNamespaceImpl::createSessionStorageNamespace):
(WebKit::StorageNamespaceImpl::getOrCreateLocalStorageNamespace):
(WebKit::StorageNamespaceImpl::storageArea):
(WebCore::localStorageNamespaceMap): Deleted.
(WebCore::StorageNamespaceImpl::createSessionStorageNamespace): Deleted.
(WebCore::StorageNamespaceImpl::getOrCreateLocalStorageNamespace): Deleted.
(WebCore::StorageNamespaceImpl::StorageNamespaceImpl): Deleted.
(WebCore::StorageNamespaceImpl::~StorageNamespaceImpl): Deleted.
(WebCore::StorageNamespaceImpl::copy): Deleted.
(WebCore::StorageNamespaceImpl::storageArea): Deleted.
(WebCore::StorageNamespaceImpl::close): Deleted.
(WebCore::StorageNamespaceImpl::clearOriginForDeletion): Deleted.
(WebCore::StorageNamespaceImpl::clearAllOriginsForDeletion): Deleted.
(WebCore::StorageNamespaceImpl::sync): Deleted.
(WebCore::StorageNamespaceImpl::closeIdleLocalStorageDatabases): Deleted.
* Storage/StorageNamespaceImpl.h:
* Storage/StorageTracker.cpp:
(WebCore::StorageTracker::initializeTracker): Deleted.
(WebCore::StorageTracker::internalInitialize): Deleted.
(WebCore::StorageTracker::tracker): Deleted.
(WebCore::StorageTracker::StorageTracker): Deleted.
(WebCore::StorageTracker::setDatabaseDirectoryPath): Deleted.
(WebCore::StorageTracker::databaseDirectoryPath): Deleted.
(WebCore::StorageTracker::trackerDatabasePath): Deleted.
(WebCore::ensureDatabaseFileExists): Deleted.
(WebCore::StorageTracker::openTrackerDatabase): Deleted.
(WebCore::StorageTracker::importOriginIdentifiers): Deleted.
(WebCore::StorageTracker::finishedImportingOriginIdentifiers): Deleted.
(WebCore::StorageTracker::syncImportOriginIdentifiers): Deleted.
(WebCore::StorageTracker::syncFileSystemAndTrackerDatabase): Deleted.
(WebCore::StorageTracker::setOriginDetails): Deleted.
(WebCore::StorageTracker::syncSetOriginDetails): Deleted.
(WebCore::StorageTracker::origins): Deleted.
(WebCore::StorageTracker::deleteAllOrigins): Deleted.
(WebCore::truncateDatabaseFile): Deleted.
(WebCore::StorageTracker::syncDeleteAllOrigins): Deleted.
(WebCore::StorageTracker::deleteOriginWithIdentifier): Deleted.
(WebCore::StorageTracker::deleteOrigin): Deleted.
(WebCore::StorageTracker::syncDeleteOrigin): Deleted.
(WebCore::StorageTracker::willDeleteAllOrigins): Deleted.
(WebCore::StorageTracker::willDeleteOrigin): Deleted.
(WebCore::StorageTracker::canDeleteOrigin): Deleted.
(WebCore::StorageTracker::cancelDeletingOrigin): Deleted.
(WebCore::StorageTracker::isActive): Deleted.
(WebCore::StorageTracker::setIsActive): Deleted.
(WebCore::StorageTracker::databasePathForOrigin): Deleted.
(WebCore::StorageTracker::diskUsageForOrigin): Deleted.
* Storage/StorageTracker.h:
(WebCore::StorageTracker::storageDatabaseIdleInterval): Deleted.
(WebCore::StorageTracker::setStorageDatabaseIdleInterval): Deleted.
* Storage/WebStorageNamespaceProvider.cpp:
(storageNamespaceProviders): Deleted.
(WebStorageNamespaceProvider::create): Deleted.
(WebStorageNamespaceProvider::WebStorageNamespaceProvider): Deleted.
(WebStorageNamespaceProvider::~WebStorageNamespaceProvider): Deleted.
(WebStorageNamespaceProvider::closeLocalStorage): Deleted.
(WebStorageNamespaceProvider::clearLocalStorageForAllOrigins): Deleted.
(WebStorageNamespaceProvider::clearLocalStorageForOrigin): Deleted.
(WebStorageNamespaceProvider::closeIdleLocalStorageDatabases): Deleted.
(WebStorageNamespaceProvider::syncLocalStorage): Deleted.
(WebStorageNamespaceProvider::createSessionStorageNamespace): Deleted.
(WebStorageNamespaceProvider::createLocalStorageNamespace): Deleted.
(WebStorageNamespaceProvider::createTransientLocalStorageNamespace): Deleted.
* Storage/WebStorageNamespaceProvider.h:
* WebCoreSupport/WebResourceLoadScheduler.h:
* WebCoreSupport/WebViewGroup.cpp:
(WebViewGroup::storageNamespaceProvider):
Source/WebKit/mac:
* Storage/WebStorageManager.mm:
(-[WebStorageManager origins]):
(-[WebStorageManager deleteAllOrigins]):
(-[WebStorageManager deleteOrigin:]):
(-[WebStorageManager diskUsageForOrigin:]):
(-[WebStorageManager syncLocalStorage]):
(-[WebStorageManager syncFileSystemAndTrackerDatabase]):
(+[WebStorageManager setStorageDatabaseIdleInterval:]):
(+[WebStorageManager closeIdleLocalStorageDatabases]):
(WebKitInitializeStorageIfNecessary):
* WebView/WebView.mm:
(+[WebView _applicationWillTerminate]):
Source/WebKit2:
Use more Refs!
* NetworkProcess/CustomProtocols/CustomProtocolManager.h:
* Platform/IPC/Connection.cpp:
(IPC::Connection::addWorkQueueMessageReceiver):
* Platform/IPC/Connection.h:
* UIProcess/Storage/LocalStorageDatabase.cpp:
(WebKit::LocalStorageDatabase::create):
(WebKit::LocalStorageDatabase::LocalStorageDatabase):
* UIProcess/Storage/LocalStorageDatabase.h:
* UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
(WebKit::LocalStorageDatabaseTracker::create):
(WebKit::LocalStorageDatabaseTracker::LocalStorageDatabaseTracker):
* UIProcess/Storage/LocalStorageDatabaseTracker.h:
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded):
(WebKit::StorageManager::StorageManager):
* UIProcess/Storage/StorageManager.h:
* UIProcess/WebResourceLoadStatisticsStore.cpp:
(WebKit::WebResourceLoadStatisticsStore::processWillOpenConnection):
* UIProcess/mac/SecItemShimProxy.cpp:
(WebKit::SecItemShimProxy::initializeConnection):
* WebProcess/Plugins/PluginProcessConnectionManager.cpp:
(WebKit::PluginProcessConnectionManager::initializeConnection):
* WebProcess/WebPage/EventDispatcher.cpp:
(WebKit::EventDispatcher::initializeConnection):
* WebProcess/WebPage/ViewUpdateDispatcher.cpp:
(WebKit::ViewUpdateDispatcher::initializeConnection):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitStorageStorageAreaImplcpp">trunk/Source/WebKit/Storage/StorageAreaImpl.cpp</a></li>
<li><a href="#trunkSourceWebKitStorageStorageAreaImplh">trunk/Source/WebKit/Storage/StorageAreaImpl.h</a></li>
<li><a href="#trunkSourceWebKitStorageStorageAreaSynccpp">trunk/Source/WebKit/Storage/StorageAreaSync.cpp</a></li>
<li><a href="#trunkSourceWebKitStorageStorageAreaSynch">trunk/Source/WebKit/Storage/StorageAreaSync.h</a></li>
<li><a href="#trunkSourceWebKitStorageStorageNamespaceImplcpp">trunk/Source/WebKit/Storage/StorageNamespaceImpl.cpp</a></li>
<li><a href="#trunkSourceWebKitStorageStorageNamespaceImplh">trunk/Source/WebKit/Storage/StorageNamespaceImpl.h</a></li>
<li><a href="#trunkSourceWebKitStorageStorageTrackercpp">trunk/Source/WebKit/Storage/StorageTracker.cpp</a></li>
<li><a href="#trunkSourceWebKitStorageStorageTrackerh">trunk/Source/WebKit/Storage/StorageTracker.h</a></li>
<li><a href="#trunkSourceWebKitStorageWebStorageNamespaceProvidercpp">trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp</a></li>
<li><a href="#trunkSourceWebKitStorageWebStorageNamespaceProviderh">trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h</a></li>
<li><a href="#trunkSourceWebKitWebCoreSupportWebResourceLoadSchedulerh">trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h</a></li>
<li><a href="#trunkSourceWebKitWebCoreSupportWebViewGroupcpp">trunk/Source/WebKit/WebCoreSupport/WebViewGroup.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacStorageWebStorageManagermm">trunk/Source/WebKit/mac/Storage/WebStorageManager.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessCustomProtocolsCustomProtocolManagerh">trunk/Source/WebKit2/NetworkProcess/CustomProtocols/CustomProtocolManager.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabasecpp">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseh">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh">trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagerh">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebResourceLoadStatisticsStorecpp">trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacSecItemShimProxycpp">trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionManagercpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageEventDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageViewUpdateDispatchercpp">trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/ChangeLog 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -1,3 +1,131 @@
</span><ins>+2016-11-09 Alex Christensen <achristensen@webkit.org>
+
+ Clean up Storage code
+ https://bugs.webkit.org/show_bug.cgi?id=164562
+
+ Reviewed by Brady Eidson.
+
+ Some classes were in WebCore namespace instead of WebKit.
+
+ * Storage/StorageAreaImpl.cpp:
+ (WebKit::StorageAreaImpl::StorageAreaImpl):
+ (WebKit::StorageAreaImpl::create):
+ (WebKit::StorageAreaImpl::copy):
+ (WebCore::StorageAreaImpl::~StorageAreaImpl): Deleted.
+ (WebCore::StorageAreaImpl::StorageAreaImpl): Deleted.
+ (WebCore::StorageAreaImpl::create): Deleted.
+ (WebCore::StorageAreaImpl::copy): Deleted.
+ (WebCore::StorageAreaImpl::canAccessStorage): Deleted.
+ (WebCore::StorageAreaImpl::storageType): Deleted.
+ (WebCore::StorageAreaImpl::length): Deleted.
+ (WebCore::StorageAreaImpl::key): Deleted.
+ (WebCore::StorageAreaImpl::item): Deleted.
+ (WebCore::StorageAreaImpl::setItem): Deleted.
+ (WebCore::StorageAreaImpl::removeItem): Deleted.
+ (WebCore::StorageAreaImpl::clear): Deleted.
+ (WebCore::StorageAreaImpl::contains): Deleted.
+ (WebCore::StorageAreaImpl::importItems): Deleted.
+ (WebCore::StorageAreaImpl::close): Deleted.
+ (WebCore::StorageAreaImpl::clearForOriginDeletion): Deleted.
+ (WebCore::StorageAreaImpl::sync): Deleted.
+ (WebCore::StorageAreaImpl::blockUntilImportComplete): Deleted.
+ (WebCore::StorageAreaImpl::memoryBytesUsedByCache): Deleted.
+ (WebCore::StorageAreaImpl::incrementAccessCount): Deleted.
+ (WebCore::StorageAreaImpl::decrementAccessCount): Deleted.
+ (WebCore::StorageAreaImpl::closeDatabaseTimerFired): Deleted.
+ (WebCore::StorageAreaImpl::closeDatabaseIfIdle): Deleted.
+ (WebCore::StorageAreaImpl::dispatchStorageEvent): Deleted.
+ * Storage/StorageAreaImpl.h:
+ * Storage/StorageAreaSync.cpp:
+ (WebKit::StorageAreaSync::StorageAreaSync):
+ (WebKit::StorageAreaSync::create):
+ (WebCore::StorageAreaSync::StorageAreaSync): Deleted.
+ (WebCore::StorageAreaSync::create): Deleted.
+ (WebCore::StorageAreaSync::~StorageAreaSync): Deleted.
+ (WebCore::StorageAreaSync::scheduleFinalSync): Deleted.
+ (WebCore::StorageAreaSync::scheduleItemForSync): Deleted.
+ (WebCore::StorageAreaSync::scheduleClear): Deleted.
+ (WebCore::StorageAreaSync::scheduleCloseDatabase): Deleted.
+ (WebCore::StorageAreaSync::syncTimerFired): Deleted.
+ (WebCore::StorageAreaSync::openDatabase): Deleted.
+ (WebCore::StorageAreaSync::migrateItemTableIfNeeded): Deleted.
+ (WebCore::StorageAreaSync::performImport): Deleted.
+ (WebCore::StorageAreaSync::markImported): Deleted.
+ (WebCore::StorageAreaSync::blockUntilImportComplete): Deleted.
+ (WebCore::StorageAreaSync::sync): Deleted.
+ (WebCore::StorageAreaSync::performSync): Deleted.
+ (WebCore::StorageAreaSync::deleteEmptyDatabase): Deleted.
+ (WebCore::StorageAreaSync::scheduleSync): Deleted.
+ * Storage/StorageAreaSync.h:
+ * Storage/StorageNamespaceImpl.cpp:
+ (WebKit::StorageNamespaceImpl::createSessionStorageNamespace):
+ (WebKit::StorageNamespaceImpl::getOrCreateLocalStorageNamespace):
+ (WebKit::StorageNamespaceImpl::storageArea):
+ (WebCore::localStorageNamespaceMap): Deleted.
+ (WebCore::StorageNamespaceImpl::createSessionStorageNamespace): Deleted.
+ (WebCore::StorageNamespaceImpl::getOrCreateLocalStorageNamespace): Deleted.
+ (WebCore::StorageNamespaceImpl::StorageNamespaceImpl): Deleted.
+ (WebCore::StorageNamespaceImpl::~StorageNamespaceImpl): Deleted.
+ (WebCore::StorageNamespaceImpl::copy): Deleted.
+ (WebCore::StorageNamespaceImpl::storageArea): Deleted.
+ (WebCore::StorageNamespaceImpl::close): Deleted.
+ (WebCore::StorageNamespaceImpl::clearOriginForDeletion): Deleted.
+ (WebCore::StorageNamespaceImpl::clearAllOriginsForDeletion): Deleted.
+ (WebCore::StorageNamespaceImpl::sync): Deleted.
+ (WebCore::StorageNamespaceImpl::closeIdleLocalStorageDatabases): Deleted.
+ * Storage/StorageNamespaceImpl.h:
+ * Storage/StorageTracker.cpp:
+ (WebCore::StorageTracker::initializeTracker): Deleted.
+ (WebCore::StorageTracker::internalInitialize): Deleted.
+ (WebCore::StorageTracker::tracker): Deleted.
+ (WebCore::StorageTracker::StorageTracker): Deleted.
+ (WebCore::StorageTracker::setDatabaseDirectoryPath): Deleted.
+ (WebCore::StorageTracker::databaseDirectoryPath): Deleted.
+ (WebCore::StorageTracker::trackerDatabasePath): Deleted.
+ (WebCore::ensureDatabaseFileExists): Deleted.
+ (WebCore::StorageTracker::openTrackerDatabase): Deleted.
+ (WebCore::StorageTracker::importOriginIdentifiers): Deleted.
+ (WebCore::StorageTracker::finishedImportingOriginIdentifiers): Deleted.
+ (WebCore::StorageTracker::syncImportOriginIdentifiers): Deleted.
+ (WebCore::StorageTracker::syncFileSystemAndTrackerDatabase): Deleted.
+ (WebCore::StorageTracker::setOriginDetails): Deleted.
+ (WebCore::StorageTracker::syncSetOriginDetails): Deleted.
+ (WebCore::StorageTracker::origins): Deleted.
+ (WebCore::StorageTracker::deleteAllOrigins): Deleted.
+ (WebCore::truncateDatabaseFile): Deleted.
+ (WebCore::StorageTracker::syncDeleteAllOrigins): Deleted.
+ (WebCore::StorageTracker::deleteOriginWithIdentifier): Deleted.
+ (WebCore::StorageTracker::deleteOrigin): Deleted.
+ (WebCore::StorageTracker::syncDeleteOrigin): Deleted.
+ (WebCore::StorageTracker::willDeleteAllOrigins): Deleted.
+ (WebCore::StorageTracker::willDeleteOrigin): Deleted.
+ (WebCore::StorageTracker::canDeleteOrigin): Deleted.
+ (WebCore::StorageTracker::cancelDeletingOrigin): Deleted.
+ (WebCore::StorageTracker::isActive): Deleted.
+ (WebCore::StorageTracker::setIsActive): Deleted.
+ (WebCore::StorageTracker::databasePathForOrigin): Deleted.
+ (WebCore::StorageTracker::diskUsageForOrigin): Deleted.
+ * Storage/StorageTracker.h:
+ (WebCore::StorageTracker::storageDatabaseIdleInterval): Deleted.
+ (WebCore::StorageTracker::setStorageDatabaseIdleInterval): Deleted.
+ * Storage/WebStorageNamespaceProvider.cpp:
+ (storageNamespaceProviders): Deleted.
+ (WebStorageNamespaceProvider::create): Deleted.
+ (WebStorageNamespaceProvider::WebStorageNamespaceProvider): Deleted.
+ (WebStorageNamespaceProvider::~WebStorageNamespaceProvider): Deleted.
+ (WebStorageNamespaceProvider::closeLocalStorage): Deleted.
+ (WebStorageNamespaceProvider::clearLocalStorageForAllOrigins): Deleted.
+ (WebStorageNamespaceProvider::clearLocalStorageForOrigin): Deleted.
+ (WebStorageNamespaceProvider::closeIdleLocalStorageDatabases): Deleted.
+ (WebStorageNamespaceProvider::syncLocalStorage): Deleted.
+ (WebStorageNamespaceProvider::createSessionStorageNamespace): Deleted.
+ (WebStorageNamespaceProvider::createLocalStorageNamespace): Deleted.
+ (WebStorageNamespaceProvider::createTransientLocalStorageNamespace): Deleted.
+ * Storage/WebStorageNamespaceProvider.h:
+ * WebCoreSupport/WebResourceLoadScheduler.h:
+ * WebCoreSupport/WebViewGroup.cpp:
+ (WebViewGroup::storageNamespaceProvider):
+
</ins><span class="cx"> 2016-11-02 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Copy build results to AAS 'Program Files' folder.
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageAreaImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageAreaImpl.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageAreaImpl.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/Storage/StorageAreaImpl.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -34,18 +34,20 @@
</span><span class="cx"> #include <WebCore/StorageMap.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><del>-namespace WebCore {
</del><ins>+using namespace WebCore;
</ins><span class="cx">
</span><ins>+namespace WebKit {
+
</ins><span class="cx"> StorageAreaImpl::~StorageAreaImpl()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline StorageAreaImpl::StorageAreaImpl(StorageType storageType, PassRefPtr<SecurityOrigin> origin, PassRefPtr<StorageSyncManager> syncManager, unsigned quota)
</del><ins>+inline StorageAreaImpl::StorageAreaImpl(StorageType storageType, RefPtr<SecurityOrigin>&& origin, RefPtr<StorageSyncManager>&& syncManager, unsigned quota)
</ins><span class="cx"> : m_storageType(storageType)
</span><del>- , m_securityOrigin(origin)
</del><ins>+ , m_securityOrigin(WTFMove(origin))
</ins><span class="cx"> , m_storageMap(StorageMap::create(quota))
</span><del>- , m_storageSyncManager(syncManager)
</del><ins>+ , m_storageSyncManager(WTFMove(syncManager))
</ins><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> , m_isShutdown(false)
</span><span class="cx"> #endif
</span><span class="lines">@@ -61,33 +63,31 @@
</span><span class="cx"> StorageTracker::tracker();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<StorageAreaImpl> StorageAreaImpl::create(StorageType storageType, PassRefPtr<SecurityOrigin> origin, PassRefPtr<StorageSyncManager> syncManager, unsigned quota)
</del><ins>+Ref<StorageAreaImpl> StorageAreaImpl::create(StorageType storageType, RefPtr<SecurityOrigin>&& origin, RefPtr<StorageSyncManager>&& syncManager, unsigned quota)
</ins><span class="cx"> {
</span><del>- Ref<StorageAreaImpl> area = adoptRef(*new StorageAreaImpl(storageType, origin, syncManager, quota));
-
</del><ins>+ Ref<StorageAreaImpl> area = adoptRef(*new StorageAreaImpl(storageType, WTFMove(origin), WTFMove(syncManager), quota));
</ins><span class="cx"> // FIXME: If there's no backing storage for LocalStorage, the default WebKit behavior should be that of private browsing,
</span><span class="cx"> // not silently ignoring it. https://bugs.webkit.org/show_bug.cgi?id=25894
</span><span class="cx"> if (area->m_storageSyncManager) {
</span><del>- area->m_storageAreaSync = StorageAreaSync::create(area->m_storageSyncManager, area.ptr(), area->m_securityOrigin->databaseIdentifier());
</del><ins>+ area->m_storageAreaSync = StorageAreaSync::create(area->m_storageSyncManager.get(), area.copyRef(), area->m_securityOrigin->databaseIdentifier());
</ins><span class="cx"> ASSERT(area->m_storageAreaSync);
</span><span class="cx"> }
</span><del>-
</del><span class="cx"> return area;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<StorageAreaImpl> StorageAreaImpl::copy()
</del><ins>+Ref<StorageAreaImpl> StorageAreaImpl::copy()
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!m_isShutdown);
</span><del>- return adoptRef(new StorageAreaImpl(this));
</del><ins>+ return adoptRef(*new StorageAreaImpl(*this));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-StorageAreaImpl::StorageAreaImpl(StorageAreaImpl* area)
- : m_storageType(area->m_storageType)
- , m_securityOrigin(area->m_securityOrigin)
- , m_storageMap(area->m_storageMap)
- , m_storageSyncManager(area->m_storageSyncManager)
</del><ins>+StorageAreaImpl::StorageAreaImpl(const StorageAreaImpl& area)
+ : m_storageType(area.m_storageType)
+ , m_securityOrigin(area.m_securityOrigin.copyRef())
+ , m_storageMap(area.m_storageMap)
+ , m_storageSyncManager(area.m_storageSyncManager)
</ins><span class="cx"> #ifndef NDEBUG
</span><del>- , m_isShutdown(area->m_isShutdown)
</del><ins>+ , m_isShutdown(area.m_isShutdown)
</ins><span class="cx"> #endif
</span><span class="cx"> , m_accessCount(0)
</span><span class="cx"> , m_closeDatabaseTimer(*this, &StorageAreaImpl::closeDatabaseTimerFired)
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageAreaImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageAreaImpl.h (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageAreaImpl.h 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/Storage/StorageAreaImpl.h 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -23,36 +23,37 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef StorageAreaImpl_h
-#define StorageAreaImpl_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/StorageArea.h>
</span><span class="cx"> #include <WebCore/Timer.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-
</del><span class="cx"> class SecurityOrigin;
</span><span class="cx"> class StorageMap;
</span><ins>+}
+
+namespace WebKit {
+
</ins><span class="cx"> class StorageAreaSync;
</span><span class="cx">
</span><del>-class StorageAreaImpl : public StorageArea {
</del><ins>+class StorageAreaImpl : public WebCore::StorageArea {
</ins><span class="cx"> public:
</span><del>- static Ref<StorageAreaImpl> create(StorageType, PassRefPtr<SecurityOrigin>, PassRefPtr<StorageSyncManager>, unsigned quota);
</del><ins>+ static Ref<StorageAreaImpl> create(WebCore::StorageType, RefPtr<WebCore::SecurityOrigin>&&, RefPtr<WebCore::StorageSyncManager>&&, unsigned quota);
</ins><span class="cx"> virtual ~StorageAreaImpl();
</span><span class="cx">
</span><span class="cx"> unsigned length() override;
</span><span class="cx"> String key(unsigned index) override;
</span><span class="cx"> String item(const String& key) override;
</span><del>- void setItem(Frame* sourceFrame, const String& key, const String& value, bool& quotaException) override;
- void removeItem(Frame* sourceFrame, const String& key) override;
- void clear(Frame* sourceFrame) override;
</del><ins>+ void setItem(WebCore::Frame* sourceFrame, const String& key, const String& value, bool& quotaException) override;
+ void removeItem(WebCore::Frame* sourceFrame, const String& key) override;
+ void clear(WebCore::Frame* sourceFrame) override;
</ins><span class="cx"> bool contains(const String& key) override;
</span><span class="cx">
</span><del>- bool canAccessStorage(Frame* sourceFrame) override;
- StorageType storageType() const override;
</del><ins>+ bool canAccessStorage(WebCore::Frame* sourceFrame) override;
+ WebCore::StorageType storageType() const override;
</ins><span class="cx">
</span><span class="cx"> size_t memoryBytesUsedByCache() override;
</span><span class="cx">
</span><span class="lines">@@ -60,9 +61,9 @@
</span><span class="cx"> void decrementAccessCount() override;
</span><span class="cx"> void closeDatabaseIfIdle() override;
</span><span class="cx">
</span><del>- SecurityOrigin& securityOrigin() override { return *m_securityOrigin; }
</del><ins>+ WebCore::SecurityOrigin& securityOrigin() override { return *m_securityOrigin.get(); }
</ins><span class="cx">
</span><del>- PassRefPtr<StorageAreaImpl> copy();
</del><ins>+ Ref<StorageAreaImpl> copy();
</ins><span class="cx"> void close();
</span><span class="cx">
</span><span class="cx"> // Only called from a background thread.
</span><span class="lines">@@ -74,28 +75,26 @@
</span><span class="cx"> void sync();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- StorageAreaImpl(StorageType, PassRefPtr<SecurityOrigin>, PassRefPtr<StorageSyncManager>, unsigned quota);
- explicit StorageAreaImpl(StorageAreaImpl*);
</del><ins>+ StorageAreaImpl(WebCore::StorageType, RefPtr<WebCore::SecurityOrigin>&&, RefPtr<WebCore::StorageSyncManager>&&, unsigned quota);
+ explicit StorageAreaImpl(const StorageAreaImpl&);
</ins><span class="cx">
</span><span class="cx"> void blockUntilImportComplete() const;
</span><span class="cx"> void closeDatabaseTimerFired();
</span><span class="cx">
</span><del>- void dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, Frame* sourceFrame);
</del><ins>+ void dispatchStorageEvent(const String& key, const String& oldValue, const String& newValue, WebCore::Frame* sourceFrame);
</ins><span class="cx">
</span><del>- StorageType m_storageType;
- RefPtr<SecurityOrigin> m_securityOrigin;
- RefPtr<StorageMap> m_storageMap;
</del><ins>+ WebCore::StorageType m_storageType;
+ RefPtr<WebCore::SecurityOrigin> m_securityOrigin;
+ RefPtr<WebCore::StorageMap> m_storageMap;
</ins><span class="cx">
</span><span class="cx"> RefPtr<StorageAreaSync> m_storageAreaSync;
</span><del>- RefPtr<StorageSyncManager> m_storageSyncManager;
</del><ins>+ RefPtr<WebCore::StorageSyncManager> m_storageSyncManager;
</ins><span class="cx">
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> bool m_isShutdown;
</span><span class="cx"> #endif
</span><span class="cx"> unsigned m_accessCount;
</span><del>- Timer m_closeDatabaseTimer;
</del><ins>+ WebCore::Timer m_closeDatabaseTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // StorageAreaImpl_h
</del></span></pre></div>
<a id="trunkSourceWebKitStorageStorageAreaSynccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageAreaSync.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageAreaSync.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/Storage/StorageAreaSync.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -35,8 +35,10 @@
</span><span class="cx"> #include <WebCore/SuddenTermination.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="cx">
</span><del>-namespace WebCore {
</del><ins>+using namespace WebCore;
</ins><span class="cx">
</span><ins>+namespace WebKit {
+
</ins><span class="cx"> // If the StorageArea undergoes rapid changes, don't sync each change to disk.
</span><span class="cx"> // Instead, queue up a batch of items to sync and actually do the sync at the following interval.
</span><span class="cx"> static const double StorageSyncInterval = 1.0;
</span><span class="lines">@@ -45,12 +47,12 @@
</span><span class="cx"> // much harder to starve the rest of LocalStorage and the OS's IO subsystem in general.
</span><span class="cx"> static const int MaxiumItemsToSync = 100;
</span><span class="cx">
</span><del>-inline StorageAreaSync::StorageAreaSync(PassRefPtr<StorageSyncManager> storageSyncManager, PassRefPtr<StorageAreaImpl> storageArea, const String& databaseIdentifier)
</del><ins>+inline StorageAreaSync::StorageAreaSync(RefPtr<StorageSyncManager>&& storageSyncManager, Ref<StorageAreaImpl>&& storageArea, const String& databaseIdentifier)
</ins><span class="cx"> : m_syncTimer(*this, &StorageAreaSync::syncTimerFired)
</span><span class="cx"> , m_itemsCleared(false)
</span><span class="cx"> , m_finalSyncScheduled(false)
</span><del>- , m_storageArea(storageArea)
- , m_syncManager(storageSyncManager)
</del><ins>+ , m_storageArea(WTFMove(storageArea))
+ , m_syncManager(WTFMove(storageSyncManager))
</ins><span class="cx"> , m_databaseIdentifier(databaseIdentifier.isolatedCopy())
</span><span class="cx"> , m_clearItemsWhileSyncing(false)
</span><span class="cx"> , m_syncScheduled(false)
</span><span class="lines">@@ -71,9 +73,9 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<StorageAreaSync> StorageAreaSync::create(PassRefPtr<StorageSyncManager> storageSyncManager, PassRefPtr<StorageAreaImpl> storageArea, const String& databaseIdentifier)
</del><ins>+Ref<StorageAreaSync> StorageAreaSync::create(RefPtr<StorageSyncManager>&& storageSyncManager, Ref<StorageAreaImpl>&& storageArea, const String& databaseIdentifier)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new StorageAreaSync(storageSyncManager, storageArea, databaseIdentifier));
</del><ins>+ return adoptRef(*new StorageAreaSync(WTFMove(storageSyncManager), WTFMove(storageArea), databaseIdentifier));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StorageAreaSync::~StorageAreaSync()
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageAreaSynch"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageAreaSync.h (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageAreaSync.h 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/Storage/StorageAreaSync.h 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef StorageAreaSync_h
-#define StorageAreaSync_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/SQLiteDatabase.h>
</span><span class="cx"> #include <WebCore/Timer.h>
</span><span class="lines">@@ -33,14 +32,16 @@
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><ins>+class StorageSyncManager;
+}
</ins><span class="cx">
</span><del>-class Frame;
</del><ins>+namespace WebKit {
+
</ins><span class="cx"> class StorageAreaImpl;
</span><del>-class StorageSyncManager;
</del><span class="cx">
</span><span class="cx"> class StorageAreaSync : public ThreadSafeRefCounted<StorageAreaSync> {
</span><span class="cx"> public:
</span><del>- static Ref<StorageAreaSync> create(PassRefPtr<StorageSyncManager>, PassRefPtr<StorageAreaImpl>, const String& databaseIdentifier);
</del><ins>+ static Ref<StorageAreaSync> create(RefPtr<WebCore::StorageSyncManager>&&, Ref<StorageAreaImpl>&&, const String& databaseIdentifier);
</ins><span class="cx"> ~StorageAreaSync();
</span><span class="cx">
</span><span class="cx"> void scheduleFinalSync();
</span><span class="lines">@@ -53,9 +54,9 @@
</span><span class="cx"> void scheduleSync();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- StorageAreaSync(PassRefPtr<StorageSyncManager>, PassRefPtr<StorageAreaImpl>, const String& databaseIdentifier);
</del><ins>+ StorageAreaSync(RefPtr<WebCore::StorageSyncManager>&&, Ref<StorageAreaImpl>&&, const String& databaseIdentifier);
</ins><span class="cx">
</span><del>- Timer m_syncTimer;
</del><ins>+ WebCore::Timer m_syncTimer;
</ins><span class="cx"> HashMap<String, String> m_changedItems;
</span><span class="cx"> bool m_itemsCleared;
</span><span class="cx">
</span><span class="lines">@@ -62,10 +63,10 @@
</span><span class="cx"> bool m_finalSyncScheduled;
</span><span class="cx">
</span><span class="cx"> RefPtr<StorageAreaImpl> m_storageArea;
</span><del>- RefPtr<StorageSyncManager> m_syncManager;
</del><ins>+ RefPtr<WebCore::StorageSyncManager> m_syncManager;
</ins><span class="cx">
</span><span class="cx"> // The database handle will only ever be opened and used on the background thread.
</span><del>- SQLiteDatabase m_database;
</del><ins>+ WebCore::SQLiteDatabase m_database;
</ins><span class="cx">
</span><span class="cx"> // The following members are subject to thread synchronization issues.
</span><span class="cx"> public:
</span><span class="lines">@@ -103,5 +104,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // StorageAreaSync_h
</del></span></pre></div>
<a id="trunkSourceWebKitStorageStorageNamespaceImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageNamespaceImpl.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageNamespaceImpl.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/Storage/StorageNamespaceImpl.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -33,8 +33,10 @@
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><del>-namespace WebCore {
</del><ins>+using namespace WebCore;
</ins><span class="cx">
</span><ins>+namespace WebKit {
+
</ins><span class="cx"> static HashMap<String, StorageNamespaceImpl*>& localStorageNamespaceMap()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<HashMap<String, StorageNamespaceImpl*>> localStorageNamespaceMap;
</span><span class="lines">@@ -42,21 +44,21 @@
</span><span class="cx"> return localStorageNamespaceMap;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createSessionStorageNamespace(unsigned quota)
</del><ins>+Ref<StorageNamespaceImpl> StorageNamespaceImpl::createSessionStorageNamespace(unsigned quota)
</ins><span class="cx"> {
</span><del>- return adoptRef(new StorageNamespaceImpl(SessionStorage, String(), quota));
</del><ins>+ return adoptRef(*new StorageNamespaceImpl(SessionStorage, String(), quota));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<StorageNamespaceImpl> StorageNamespaceImpl::getOrCreateLocalStorageNamespace(const String& databasePath, unsigned quota)
</del><ins>+Ref<StorageNamespaceImpl> StorageNamespaceImpl::getOrCreateLocalStorageNamespace(const String& databasePath, unsigned quota)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!databasePath.isNull());
</span><span class="cx">
</span><span class="cx"> auto& slot = localStorageNamespaceMap().add(databasePath, nullptr).iterator->value;
</span><span class="cx"> if (slot)
</span><del>- return slot;
</del><ins>+ return *slot;
</ins><span class="cx">
</span><del>- RefPtr<StorageNamespaceImpl> storageNamespace = adoptRef(new StorageNamespaceImpl(LocalStorage, databasePath, quota));
- slot = storageNamespace.get();
</del><ins>+ Ref<StorageNamespaceImpl> storageNamespace = adoptRef(*new StorageNamespaceImpl(LocalStorage, databasePath, quota));
+ slot = storageNamespace.ptr();
</ins><span class="cx">
</span><span class="cx"> return storageNamespace;
</span><span class="cx"> }
</span><span class="lines">@@ -105,11 +107,11 @@
</span><span class="cx"> ASSERT(!m_isShutdown);
</span><span class="cx">
</span><span class="cx"> RefPtr<StorageAreaImpl> storageArea;
</span><del>- if ((storageArea = m_storageAreaMap.get(origin)))
</del><ins>+ if ((storageArea = m_storageAreaMap.get(origin.get())))
</ins><span class="cx"> return storageArea;
</span><span class="cx">
</span><del>- storageArea = StorageAreaImpl::create(m_storageType, origin.copyRef(), m_syncManager, m_quota);
- m_storageAreaMap.set(WTFMove(origin), storageArea);
</del><ins>+ storageArea = StorageAreaImpl::create(m_storageType, origin.get(), m_syncManager.get(), m_quota);
+ m_storageAreaMap.set(origin, storageArea.get());
</ins><span class="cx"> return storageArea;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageNamespaceImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageNamespaceImpl.h (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageNamespaceImpl.h 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/Storage/StorageNamespaceImpl.h 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef StorageNamespaceImpl_h
-#define StorageNamespaceImpl_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/SecurityOriginHash.h>
</span><span class="cx"> #include <WebCore/StorageArea.h>
</span><span class="lines">@@ -33,14 +32,14 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><del>-namespace WebCore {
</del><ins>+namespace WebKit {
</ins><span class="cx">
</span><span class="cx"> class StorageAreaImpl;
</span><span class="cx">
</span><del>-class StorageNamespaceImpl : public StorageNamespace {
</del><ins>+class StorageNamespaceImpl : public WebCore::StorageNamespace {
</ins><span class="cx"> public:
</span><del>- WEBCORE_EXPORT static RefPtr<StorageNamespaceImpl> createSessionStorageNamespace(unsigned quota);
- WEBCORE_EXPORT static RefPtr<StorageNamespaceImpl> getOrCreateLocalStorageNamespace(const String& databasePath, unsigned quota);
</del><ins>+ static Ref<StorageNamespaceImpl> createSessionStorageNamespace(unsigned quota);
+ static Ref<StorageNamespaceImpl> getOrCreateLocalStorageNamespace(const String& databasePath, unsigned quota);
</ins><span class="cx"> virtual ~StorageNamespaceImpl();
</span><span class="cx">
</span><span class="cx"> void close();
</span><span class="lines">@@ -49,25 +48,25 @@
</span><span class="cx"> // we're just deleting the underlying db file. If an item is added immediately
</span><span class="cx"> // after file deletion, we want the same StorageArea to eventually trigger
</span><span class="cx"> // a sync and for StorageAreaSync to recreate the backing db file.
</span><del>- void clearOriginForDeletion(SecurityOrigin*);
</del><ins>+ void clearOriginForDeletion(WebCore::SecurityOrigin*);
</ins><span class="cx"> void clearAllOriginsForDeletion();
</span><span class="cx"> void sync();
</span><span class="cx"> void closeIdleLocalStorageDatabases();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- StorageNamespaceImpl(StorageType, const String& path, unsigned quota);
</del><ins>+ StorageNamespaceImpl(WebCore::StorageType, const String& path, unsigned quota);
</ins><span class="cx">
</span><del>- RefPtr<StorageArea> storageArea(RefPtr<SecurityOrigin>&&) override;
- RefPtr<StorageNamespace> copy(Page* newPage) override;
</del><ins>+ RefPtr<WebCore::StorageArea> storageArea(RefPtr<WebCore::SecurityOrigin>&&) override;
+ RefPtr<StorageNamespace> copy(WebCore::Page* newPage) override;
</ins><span class="cx">
</span><del>- typedef HashMap<RefPtr<SecurityOrigin>, RefPtr<StorageAreaImpl>> StorageAreaMap;
</del><ins>+ typedef HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaImpl>> StorageAreaMap;
</ins><span class="cx"> StorageAreaMap m_storageAreaMap;
</span><span class="cx">
</span><del>- StorageType m_storageType;
</del><ins>+ WebCore::StorageType m_storageType;
</ins><span class="cx">
</span><span class="cx"> // Only used if m_storageType == LocalStorage and the path was not "" in our constructor.
</span><span class="cx"> String m_path;
</span><del>- RefPtr<StorageSyncManager> m_syncManager;
</del><ins>+ RefPtr<WebCore::StorageSyncManager> m_syncManager;
</ins><span class="cx">
</span><span class="cx"> // The default quota for each new storage area.
</span><span class="cx"> unsigned m_quota;
</span><span class="lines">@@ -76,5 +75,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // StorageNamespaceImpl_h
</del></span></pre></div>
<a id="trunkSourceWebKitStorageStorageTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageTracker.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageTracker.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/Storage/StorageTracker.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -43,10 +43,12 @@
</span><span class="cx"> #include <sqlite3_private.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-namespace WebCore {
</del><ins>+using namespace WebCore;
</ins><span class="cx">
</span><del>-static StorageTracker* storageTracker = 0;
</del><ins>+namespace WebKit {
</ins><span class="cx">
</span><ins>+static StorageTracker* storageTracker = nullptr;
+
</ins><span class="cx"> // If there is no document referencing a storage database, close the underlying database
</span><span class="cx"> // after it has been idle for m_StorageDatabaseIdleInterval seconds.
</span><span class="cx"> static const double DefaultStorageDatabaseIdleInterval = 300;
</span></span></pre></div>
<a id="trunkSourceWebKitStorageStorageTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/StorageTracker.h (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/StorageTracker.h 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/Storage/StorageTracker.h 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef StorageTracker_h
-#define StorageTracker_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/SQLiteDatabase.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="lines">@@ -33,18 +32,19 @@
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><del>-
-class StorageTask;
</del><span class="cx"> class StorageThread;
</span><span class="cx"> class SecurityOrigin;
</span><del>-class StorageTrackerClient;
</del><ins>+class StorageTrackerClient;
+}
</ins><span class="cx">
</span><ins>+namespace WebKit {
+
</ins><span class="cx"> class StorageTracker {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(StorageTracker);
</span><span class="cx"> WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- WEBCORE_EXPORT static void initializeTracker(const String& storagePath, StorageTrackerClient*);
- WEBCORE_EXPORT static StorageTracker& tracker();
</del><ins>+ static void initializeTracker(const String& storagePath, WebCore::StorageTrackerClient*);
+ static StorageTracker& tracker();
</ins><span class="cx">
</span><span class="cx"> void setDatabaseDirectoryPath(const String&);
</span><span class="cx"> String databaseDirectoryPath() const;
</span><span class="lines">@@ -51,11 +51,11 @@
</span><span class="cx">
</span><span class="cx"> void setOriginDetails(const String& originIdentifier, const String& databaseFile);
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void deleteAllOrigins();
- WEBCORE_EXPORT void deleteOrigin(SecurityOrigin*);
</del><ins>+ void deleteAllOrigins();
+ void deleteOrigin(WebCore::SecurityOrigin*);
</ins><span class="cx"> void deleteOriginWithIdentifier(const String& originIdentifier);
</span><del>- WEBCORE_EXPORT void origins(Vector<RefPtr<SecurityOrigin>>& result);
- WEBCORE_EXPORT long long diskUsageForOrigin(SecurityOrigin*);
</del><ins>+ void origins(Vector<RefPtr<WebCore::SecurityOrigin>>& result);
+ long long diskUsageForOrigin(WebCore::SecurityOrigin*);
</ins><span class="cx">
</span><span class="cx"> void cancelDeletingOrigin(const String& originIdentifier);
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> double storageDatabaseIdleInterval() { return m_StorageDatabaseIdleInterval; }
</span><span class="cx"> void setStorageDatabaseIdleInterval(double interval) { m_StorageDatabaseIdleInterval = interval; }
</span><span class="cx">
</span><del>- WEBCORE_EXPORT void syncFileSystemAndTrackerDatabase();
</del><ins>+ void syncFileSystemAndTrackerDatabase();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit StorageTracker(const String& storagePath);
</span><span class="lines">@@ -96,11 +96,11 @@
</span><span class="cx">
</span><span class="cx"> // Mutex for m_database and m_storageDirectoryPath.
</span><span class="cx"> Lock m_databaseMutex;
</span><del>- SQLiteDatabase m_database;
</del><ins>+ WebCore::SQLiteDatabase m_database;
</ins><span class="cx"> String m_storageDirectoryPath;
</span><span class="cx">
</span><span class="cx"> Lock m_clientMutex;
</span><del>- StorageTrackerClient* m_client;
</del><ins>+ WebCore::StorageTrackerClient* m_client;
</ins><span class="cx">
</span><span class="cx"> // Guard for m_originSet and m_originsBeingDeleted.
</span><span class="cx"> Lock m_originSetMutex;
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> OriginSet m_originSet;
</span><span class="cx"> OriginSet m_originsBeingDeleted;
</span><span class="cx">
</span><del>- std::unique_ptr<StorageThread> m_thread;
</del><ins>+ std::unique_ptr<WebCore::StorageThread> m_thread;
</ins><span class="cx">
</span><span class="cx"> bool m_isActive;
</span><span class="cx"> bool m_needsInitialization;
</span><span class="lines">@@ -116,5 +116,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span><del>-
-#endif // StorageTracker_h
</del></span></pre></div>
<a id="trunkSourceWebKitStorageWebStorageNamespaceProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -30,6 +30,8 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><ins>+namespace WebKit {
+
</ins><span class="cx"> static HashSet<WebStorageNamespaceProvider*>& storageNamespaceProviders()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<HashSet<WebStorageNamespaceProvider*>> storageNamespaceProviders;
</span><span class="lines">@@ -110,3 +112,5 @@
</span><span class="cx"> // SessionStorageNamespace here.
</span><span class="cx"> return StorageNamespaceImpl::createSessionStorageNamespace(quota);
</span><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitStorageWebStorageNamespaceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -23,11 +23,12 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebStorageNamespaceProvider_h
-#define WebStorageNamespaceProvider_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/StorageNamespaceProvider.h>
</span><span class="cx">
</span><ins>+namespace WebKit {
+
</ins><span class="cx"> class WebStorageNamespaceProvider final : public WebCore::StorageNamespaceProvider {
</span><span class="cx"> public:
</span><span class="cx"> static RefPtr<WebStorageNamespaceProvider> create(const String& localStorageDatabasePath);
</span><span class="lines">@@ -51,4 +52,4 @@
</span><span class="cx"> const String m_localStorageDatabasePath;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-#endif // WebStorageNamespaceProvider_h
</del><ins>+} // namespace WebKit
</ins></span></pre></div>
<a id="trunkSourceWebKitWebCoreSupportWebResourceLoadSchedulerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/WebCoreSupport/WebResourceLoadScheduler.h 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -20,8 +20,7 @@
</span><span class="cx"> Boston, MA 02110-1301, USA.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WebResourceLoadScheduler_h
-#define WebResourceLoadScheduler_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/FrameLoaderTypes.h>
</span><span class="cx"> #include <WebCore/LoaderStrategy.h>
</span><span class="lines">@@ -104,7 +103,7 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> HostInformation* hostForURL(const WebCore::URL&, CreateHostPolicy = FindOnly);
</span><del>- WEBCORE_EXPORT void servePendingRequests(HostInformation*, WebCore::ResourceLoadPriority);
</del><ins>+ void servePendingRequests(HostInformation*, WebCore::ResourceLoadPriority);
</ins><span class="cx">
</span><span class="cx"> typedef HashMap<String, HostInformation*, StringHash> HostMap;
</span><span class="cx"> HostMap m_hosts;
</span><span class="lines">@@ -115,5 +114,3 @@
</span><span class="cx"> unsigned m_suspendPendingRequestsCount;
</span><span class="cx"> bool m_isSerialLoadingEnabled;
</span><span class="cx"> };
</span><del>-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitWebCoreSupportWebViewGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebCoreSupport/WebViewGroup.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebCoreSupport/WebViewGroup.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/WebCoreSupport/WebViewGroup.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> StorageNamespaceProvider& WebViewGroup::storageNamespaceProvider()
</span><span class="cx"> {
</span><span class="cx"> if (!m_storageNamespaceProvider)
</span><del>- m_storageNamespaceProvider = WebStorageNamespaceProvider::create(m_localStorageDatabasePath);
</del><ins>+ m_storageNamespaceProvider = WebKit::WebStorageNamespaceProvider::create(m_localStorageDatabasePath);
</ins><span class="cx">
</span><span class="cx"> return *m_storageNamespaceProvider;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-11-09 Alex Christensen <achristensen@webkit.org>
+
+ Clean up Storage code
+ https://bugs.webkit.org/show_bug.cgi?id=164562
+
+ Reviewed by Brady Eidson.
+
+ * Storage/WebStorageManager.mm:
+ (-[WebStorageManager origins]):
+ (-[WebStorageManager deleteAllOrigins]):
+ (-[WebStorageManager deleteOrigin:]):
+ (-[WebStorageManager diskUsageForOrigin:]):
+ (-[WebStorageManager syncLocalStorage]):
+ (-[WebStorageManager syncFileSystemAndTrackerDatabase]):
+ (+[WebStorageManager setStorageDatabaseIdleInterval:]):
+ (+[WebStorageManager closeIdleLocalStorageDatabases]):
+ (WebKitInitializeStorageIfNecessary):
+ * WebView/WebView.mm:
+ (+[WebView _applicationWillTerminate]):
+
</ins><span class="cx"> 2016-11-09 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Another attempted build fix.
</span></span></pre></div>
<a id="trunkSourceWebKitmacStorageWebStorageManagermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Storage/WebStorageManager.mm (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Storage/WebStorageManager.mm 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/mac/Storage/WebStorageManager.mm 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<SecurityOrigin>> coreOrigins;
</span><span class="cx">
</span><del>- StorageTracker::tracker().origins(coreOrigins);
</del><ins>+ WebKit::StorageTracker::tracker().origins(coreOrigins);
</ins><span class="cx">
</span><span class="cx"> NSMutableArray *webOrigins = [[NSMutableArray alloc] initWithCapacity:coreOrigins.size()];
</span><span class="cx">
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)deleteAllOrigins
</span><span class="cx"> {
</span><del>- StorageTracker::tracker().deleteAllOrigins();
</del><ins>+ WebKit::StorageTracker::tracker().deleteAllOrigins();
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> // FIXME: This needs to be removed once StorageTrackers in multiple processes
</span><span class="cx"> // are in sync: <rdar://problem/9567500> Remove Website Data pane is not kept in sync with Safari
</span><span class="lines">@@ -91,22 +91,22 @@
</span><span class="cx">
</span><span class="cx"> - (void)deleteOrigin:(WebSecurityOrigin *)origin
</span><span class="cx"> {
</span><del>- StorageTracker::tracker().deleteOrigin([origin _core]);
</del><ins>+ WebKit::StorageTracker::tracker().deleteOrigin([origin _core]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (unsigned long long)diskUsageForOrigin:(WebSecurityOrigin *)origin
</span><span class="cx"> {
</span><del>- return StorageTracker::tracker().diskUsageForOrigin([origin _core]);
</del><ins>+ return WebKit::StorageTracker::tracker().diskUsageForOrigin([origin _core]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)syncLocalStorage
</span><span class="cx"> {
</span><del>- WebStorageNamespaceProvider::syncLocalStorage();
</del><ins>+ WebKit::WebStorageNamespaceProvider::syncLocalStorage();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)syncFileSystemAndTrackerDatabase
</span><span class="cx"> {
</span><del>- StorageTracker::tracker().syncFileSystemAndTrackerDatabase();
</del><ins>+ WebKit::StorageTracker::tracker().syncFileSystemAndTrackerDatabase();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (NSString *)_storageDirectoryPath
</span><span class="lines">@@ -117,12 +117,12 @@
</span><span class="cx">
</span><span class="cx"> + (void)setStorageDatabaseIdleInterval:(double)interval
</span><span class="cx"> {
</span><del>- StorageTracker::tracker().setStorageDatabaseIdleInterval(interval);
</del><ins>+ WebKit::StorageTracker::tracker().setStorageDatabaseIdleInterval(interval);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> + (void)closeIdleLocalStorageDatabases
</span><span class="cx"> {
</span><del>- WebStorageNamespaceProvider::closeIdleLocalStorageDatabases();
</del><ins>+ WebKit::WebStorageNamespaceProvider::closeIdleLocalStorageDatabases();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void initializeLocalStoragePath()
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> if (initialized)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- StorageTracker::initializeTracker([WebStorageManager _storageDirectoryPath], WebStorageTrackerClient::sharedWebStorageTrackerClient());
</del><ins>+ WebKit::StorageTracker::initializeTracker([WebStorageManager _storageDirectoryPath], WebStorageTrackerClient::sharedWebStorageTrackerClient());
</ins><span class="cx">
</span><span class="cx"> initialized = YES;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -5253,7 +5253,7 @@
</span><span class="cx"> if (!pluginDatabaseClientCount)
</span><span class="cx"> [WebPluginDatabase closeSharedDatabase];
</span><span class="cx">
</span><del>- WebStorageNamespaceProvider::closeLocalStorage();
</del><ins>+ WebKit::WebStorageNamespaceProvider::closeLocalStorage();
</ins><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/ChangeLog 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2016-11-09 Alex Christensen <achristensen@webkit.org>
+
+ Clean up Storage code
+ https://bugs.webkit.org/show_bug.cgi?id=164562
+
+ Reviewed by Brady Eidson.
+
+ Use more Refs!
+
+ * NetworkProcess/CustomProtocols/CustomProtocolManager.h:
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::addWorkQueueMessageReceiver):
+ * Platform/IPC/Connection.h:
+ * UIProcess/Storage/LocalStorageDatabase.cpp:
+ (WebKit::LocalStorageDatabase::create):
+ (WebKit::LocalStorageDatabase::LocalStorageDatabase):
+ * UIProcess/Storage/LocalStorageDatabase.h:
+ * UIProcess/Storage/LocalStorageDatabaseTracker.cpp:
+ (WebKit::LocalStorageDatabaseTracker::create):
+ (WebKit::LocalStorageDatabaseTracker::LocalStorageDatabaseTracker):
+ * UIProcess/Storage/LocalStorageDatabaseTracker.h:
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::StorageArea::openDatabaseAndImportItemsIfNeeded):
+ (WebKit::StorageManager::StorageManager):
+ * UIProcess/Storage/StorageManager.h:
+ * UIProcess/WebResourceLoadStatisticsStore.cpp:
+ (WebKit::WebResourceLoadStatisticsStore::processWillOpenConnection):
+ * UIProcess/mac/SecItemShimProxy.cpp:
+ (WebKit::SecItemShimProxy::initializeConnection):
+ * WebProcess/Plugins/PluginProcessConnectionManager.cpp:
+ (WebKit::PluginProcessConnectionManager::initializeConnection):
+ * WebProcess/WebPage/EventDispatcher.cpp:
+ (WebKit::EventDispatcher::initializeConnection):
+ * WebProcess/WebPage/ViewUpdateDispatcher.cpp:
+ (WebKit::ViewUpdateDispatcher::initializeConnection):
+
</ins><span class="cx"> 2016-11-09 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Another attempted build fix.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessCustomProtocolsCustomProtocolManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/CustomProtocols/CustomProtocolManager.h (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/CustomProtocols/CustomProtocolManager.h 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/NetworkProcess/CustomProtocols/CustomProtocolManager.h 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> void wasRedirectedToRequest(uint64_t customProtocolID, const WebCore::ResourceRequest&, const WebCore::ResourceResponse& redirectResponse);
</span><span class="cx">
</span><span class="cx"> ChildProcess* m_childProcess;
</span><del>- RefPtr<WorkQueue> m_messageQueue;
</del><ins>+ Ref<WorkQueue> m_messageQueue;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> HashSet<String, ASCIICaseInsensitiveHash> m_registeredSchemes;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -264,11 +264,11 @@
</span><span class="cx"> m_shouldExitOnSyncMessageSendFailure = shouldExitOnSyncMessageSendFailure;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Connection::addWorkQueueMessageReceiver(StringReference messageReceiverName, WorkQueue* workQueue, WorkQueueMessageReceiver* workQueueMessageReceiver)
</del><ins>+void Connection::addWorkQueueMessageReceiver(StringReference messageReceiverName, WorkQueue& workQueue, WorkQueueMessageReceiver* workQueueMessageReceiver)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><del>- m_connectionQueue->dispatch([protectedThis = makeRef(*this), messageReceiverName = WTFMove(messageReceiverName), workQueue, workQueueMessageReceiver]() mutable {
</del><ins>+ m_connectionQueue->dispatch([protectedThis = makeRef(*this), messageReceiverName = WTFMove(messageReceiverName), workQueue = &workQueue, workQueueMessageReceiver]() mutable {
</ins><span class="cx"> ASSERT(!protectedThis->m_workQueueMessageReceivers.contains(messageReceiverName));
</span><span class="cx">
</span><span class="cx"> protectedThis->m_workQueueMessageReceivers.add(messageReceiverName, std::make_pair(workQueue, workQueueMessageReceiver));
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> typedef void (*DidCloseOnConnectionWorkQueueCallback)(Connection*);
</span><span class="cx"> void setDidCloseOnConnectionWorkQueueCallback(DidCloseOnConnectionWorkQueueCallback callback);
</span><span class="cx">
</span><del>- void addWorkQueueMessageReceiver(StringReference messageReceiverName, WorkQueue*, WorkQueueMessageReceiver*);
</del><ins>+ void addWorkQueueMessageReceiver(StringReference messageReceiverName, WorkQueue&, WorkQueueMessageReceiver*);
</ins><span class="cx"> void removeWorkQueueMessageReceiver(StringReference messageReceiverName);
</span><span class="cx">
</span><span class="cx"> bool open();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -46,14 +46,14 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PassRefPtr<LocalStorageDatabase> LocalStorageDatabase::create(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, Ref<SecurityOrigin>&& securityOrigin)
</del><ins>+Ref<LocalStorageDatabase> LocalStorageDatabase::create(Ref<WorkQueue>&& queue, Ref<LocalStorageDatabaseTracker>&& tracker, Ref<SecurityOrigin>&& securityOrigin)
</ins><span class="cx"> {
</span><del>- return adoptRef(new LocalStorageDatabase(queue, tracker, WTFMove(securityOrigin)));
</del><ins>+ return adoptRef(*new LocalStorageDatabase(WTFMove(queue), WTFMove(tracker), WTFMove(securityOrigin)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-LocalStorageDatabase::LocalStorageDatabase(PassRefPtr<WorkQueue> queue, PassRefPtr<LocalStorageDatabaseTracker> tracker, Ref<SecurityOrigin>&& securityOrigin)
- : m_queue(queue)
- , m_tracker(tracker)
</del><ins>+LocalStorageDatabase::LocalStorageDatabase(Ref<WorkQueue>&& queue, Ref<LocalStorageDatabaseTracker>&& tracker, Ref<SecurityOrigin>&& securityOrigin)
+ : m_queue(WTFMove(queue))
+ , m_tracker(WTFMove(tracker))
</ins><span class="cx"> , m_securityOrigin(WTFMove(securityOrigin))
</span><span class="cx"> , m_databasePath(m_tracker->databasePath(m_securityOrigin.ptr()))
</span><span class="cx"> , m_failedToOpenDatabase(false)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabase.h 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef LocalStorageDatabase_h
-#define LocalStorageDatabase_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/SQLiteDatabase.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -45,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> class LocalStorageDatabase : public ThreadSafeRefCounted<LocalStorageDatabase> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<LocalStorageDatabase> create(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, Ref<WebCore::SecurityOrigin>&&);
</del><ins>+ static Ref<LocalStorageDatabase> create(Ref<WorkQueue>&&, Ref<LocalStorageDatabaseTracker>&&, Ref<WebCore::SecurityOrigin>&&);
</ins><span class="cx"> ~LocalStorageDatabase();
</span><span class="cx">
</span><span class="cx"> // Will block until the import is complete.
</span><span class="lines">@@ -59,7 +58,7 @@
</span><span class="cx"> void close();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- LocalStorageDatabase(PassRefPtr<WorkQueue>, PassRefPtr<LocalStorageDatabaseTracker>, Ref<WebCore::SecurityOrigin>&&);
</del><ins>+ LocalStorageDatabase(Ref<WorkQueue>&&, Ref<LocalStorageDatabaseTracker>&&, Ref<WebCore::SecurityOrigin>&&);
</ins><span class="cx">
</span><span class="cx"> enum DatabaseOpeningStrategy {
</span><span class="cx"> CreateIfNonExistent,
</span><span class="lines">@@ -78,8 +77,8 @@
</span><span class="cx">
</span><span class="cx"> bool databaseIsEmpty();
</span><span class="cx">
</span><del>- RefPtr<WorkQueue> m_queue;
- RefPtr<LocalStorageDatabaseTracker> m_tracker;
</del><ins>+ Ref<WorkQueue> m_queue;
+ Ref<LocalStorageDatabaseTracker> m_tracker;
</ins><span class="cx"> Ref<WebCore::SecurityOrigin> m_securityOrigin;
</span><span class="cx">
</span><span class="cx"> String m_databasePath;
</span><span class="lines">@@ -97,5 +96,3 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // LocalStorageDatabase_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -38,13 +38,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-PassRefPtr<LocalStorageDatabaseTracker> LocalStorageDatabaseTracker::create(PassRefPtr<WorkQueue> queue, const String& localStorageDirectory)
</del><ins>+Ref<LocalStorageDatabaseTracker> LocalStorageDatabaseTracker::create(Ref<WorkQueue>&& queue, const String& localStorageDirectory)
</ins><span class="cx"> {
</span><del>- return adoptRef(new LocalStorageDatabaseTracker(queue, localStorageDirectory));
</del><ins>+ return adoptRef(*new LocalStorageDatabaseTracker(WTFMove(queue), localStorageDirectory));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-LocalStorageDatabaseTracker::LocalStorageDatabaseTracker(PassRefPtr<WorkQueue> queue, const String& localStorageDirectory)
- : m_queue(queue)
</del><ins>+LocalStorageDatabaseTracker::LocalStorageDatabaseTracker(Ref<WorkQueue>&& queue, const String& localStorageDirectory)
+ : m_queue(WTFMove(queue))
</ins><span class="cx"> , m_localStorageDirectory(localStorageDirectory.isolatedCopy())
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_localStorageDirectory.isEmpty());
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageLocalStorageDatabaseTrackerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -23,13 +23,11 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef LocalStorageDatabaseTracker_h
-#define LocalStorageDatabaseTracker_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include <WebCore/SQLiteDatabase.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Optional.h>
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/ThreadSafeRefCounted.h>
</span><span class="cx"> #include <wtf/WorkQueue.h>
</span><span class="lines">@@ -46,7 +44,7 @@
</span><span class="cx">
</span><span class="cx"> class LocalStorageDatabaseTracker : public ThreadSafeRefCounted<LocalStorageDatabaseTracker> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<LocalStorageDatabaseTracker> create(PassRefPtr<WorkQueue>, const String& localStorageDirectory);
</del><ins>+ static Ref<LocalStorageDatabaseTracker> create(Ref<WorkQueue>&&, const String& localStorageDirectory);
</ins><span class="cx"> ~LocalStorageDatabaseTracker();
</span><span class="cx">
</span><span class="cx"> String databasePath(WebCore::SecurityOrigin*) const;
</span><span class="lines">@@ -68,7 +66,7 @@
</span><span class="cx"> Vector<OriginDetails> originDetails();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- LocalStorageDatabaseTracker(PassRefPtr<WorkQueue>, const String& localStorageDirectory);
</del><ins>+ LocalStorageDatabaseTracker(Ref<WorkQueue>&&, const String& localStorageDirectory);
</ins><span class="cx">
</span><span class="cx"> String databasePath(const String& filename) const;
</span><span class="cx"> String trackerDatabasePath() const;
</span><span class="lines">@@ -94,5 +92,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><del>-
-#endif // LocalStorageDatabaseTracker_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -292,7 +292,7 @@
</span><span class="cx">
</span><span class="cx"> // We open the database here even if we've already imported our items to ensure that the database is open if we need to write to it.
</span><span class="cx"> if (!m_localStorageDatabase)
</span><del>- m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->storageManager()->m_queue, m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker, m_securityOrigin.copyRef());
</del><ins>+ m_localStorageDatabase = LocalStorageDatabase::create(m_localStorageNamespace->storageManager()->m_queue.copyRef(), m_localStorageNamespace->storageManager()->m_localStorageDatabaseTracker.copyRef(), m_securityOrigin.copyRef());
</ins><span class="cx">
</span><span class="cx"> if (m_didImportItemsFromDatabase)
</span><span class="cx"> return;
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx">
</span><span class="cx"> StorageManager::StorageManager(const String& localStorageDirectory)
</span><span class="cx"> : m_queue(WorkQueue::create("com.apple.WebKit.StorageManager"))
</span><del>- , m_localStorageDatabaseTracker(LocalStorageDatabaseTracker::create(m_queue, localStorageDirectory))
</del><ins>+ , m_localStorageDatabaseTracker(LocalStorageDatabaseTracker::create(m_queue.copyRef(), localStorageDirectory))
</ins><span class="cx"> {
</span><span class="cx"> // Make sure the encoding is initialized before we start dispatching things to the queue.
</span><span class="cx"> UTF8Encoding();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -98,9 +98,9 @@
</span><span class="cx"> class TransientLocalStorageNamespace;
</span><span class="cx"> TransientLocalStorageNamespace* getOrCreateTransientLocalStorageNamespace(uint64_t storageNamespaceID, WebCore::SecurityOrigin& topLevelOrigin);
</span><span class="cx">
</span><del>- RefPtr<WorkQueue> m_queue;
</del><ins>+ Ref<WorkQueue> m_queue;
</ins><span class="cx">
</span><del>- RefPtr<LocalStorageDatabaseTracker> m_localStorageDatabaseTracker;
</del><ins>+ Ref<LocalStorageDatabaseTracker> m_localStorageDatabaseTracker;
</ins><span class="cx"> HashMap<uint64_t, RefPtr<LocalStorageNamespace>> m_localStorageNamespaces;
</span><span class="cx">
</span><span class="cx"> HashMap<std::pair<uint64_t, RefPtr<WebCore::SecurityOrigin>>, RefPtr<TransientLocalStorageNamespace>> m_transientLocalStorageNamespaces;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebResourceLoadStatisticsStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadStatisticsStore::processWillOpenConnection(WebProcessProxy&, IPC::Connection& connection)
</span><span class="cx"> {
</span><del>- connection.addWorkQueueMessageReceiver(Messages::WebResourceLoadStatisticsStore::messageReceiverName(), &m_statisticsQueue.get(), this);
</del><ins>+ connection.addWorkQueueMessageReceiver(Messages::WebResourceLoadStatisticsStore::messageReceiverName(), m_statisticsQueue.get(), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebResourceLoadStatisticsStore::processDidCloseConnection(WebProcessProxy&, IPC::Connection& connection)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacSecItemShimProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> void SecItemShimProxy::initializeConnection(IPC::Connection& connection)
</span><span class="cx"> {
</span><del>- connection.addWorkQueueMessageReceiver(Messages::SecItemShimProxy::messageReceiverName(), &m_queue.get(), this);
</del><ins>+ connection.addWorkQueueMessageReceiver(Messages::SecItemShimProxy::messageReceiverName(), m_queue.get(), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SecItemShimProxy::didReceiveMessage(IPC::Connection&, IPC::Decoder&)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginProcessConnectionManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginProcessConnectionManager.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> void PluginProcessConnectionManager::initializeConnection(IPC::Connection* connection)
</span><span class="cx"> {
</span><del>- connection->addWorkQueueMessageReceiver(Messages::PluginProcessConnectionManager::messageReceiverName(), &m_queue.get(), this);
</del><ins>+ connection->addWorkQueueMessageReceiver(Messages::PluginProcessConnectionManager::messageReceiverName(), m_queue.get(), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PluginProcessConnection* PluginProcessConnectionManager::getPluginProcessConnection(uint64_t pluginProcessToken)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/WebProcess/WebPage/EventDispatcher.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> void EventDispatcher::initializeConnection(IPC::Connection* connection)
</span><span class="cx"> {
</span><del>- connection->addWorkQueueMessageReceiver(Messages::EventDispatcher::messageReceiverName(), &m_queue.get(), this);
</del><ins>+ connection->addWorkQueueMessageReceiver(Messages::EventDispatcher::messageReceiverName(), m_queue.get(), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void EventDispatcher::wheelEvent(uint64_t pageID, const WebWheelEvent& wheelEvent, bool canRubberBandAtLeft, bool canRubberBandAtRight, bool canRubberBandAtTop, bool canRubberBandAtBottom)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageViewUpdateDispatchercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp (208498 => 208499)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp 2016-11-09 23:27:19 UTC (rev 208498)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ViewUpdateDispatcher.cpp 2016-11-09 23:28:12 UTC (rev 208499)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> void ViewUpdateDispatcher::initializeConnection(IPC::Connection* connection)
</span><span class="cx"> {
</span><del>- connection->addWorkQueueMessageReceiver(Messages::ViewUpdateDispatcher::messageReceiverName(), &m_queue.get(), this);
</del><ins>+ connection->addWorkQueueMessageReceiver(Messages::ViewUpdateDispatcher::messageReceiverName(), m_queue.get(), this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ViewUpdateDispatcher::visibleContentRectUpdate(uint64_t pageID, const VisibleContentRectUpdateInfo& visibleContentRectUpdateInfo)
</span></span></pre>
</div>
</div>
</body>
</html>