<!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>[177857] 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/177857">177857</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-01 21:26:52 -0800 (Thu, 01 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove GroupSettings
https://bugs.webkit.org/show_bug.cgi?id=140037
Patch by Sam Weinig <sam@webkit.org> on 2015-01-01
Reviewed by Dan Bernstein.
Source/WebCore:
Nothing sets the values in GroupSettings and nothing uses them.
- The indexedDBDatabasePath is accessed and sent to the IndexedDB backend,
but the backend then proceeds to not use it.
* CMakeLists.txt:
* Modules/indexeddb/IDBFactory.cpp:
(WebCore::IDBFactory::getDatabaseNames):
(WebCore::IDBFactory::deleteDatabase):
* Modules/indexeddb/IDBFactoryBackendInterface.cpp:
(WebCore::IDBFactoryBackendInterface::create):
* Modules/indexeddb/IDBFactoryBackendInterface.h:
* Modules/indexeddb/PageGroupIndexedDatabase.cpp:
(WebCore::PageGroupIndexedDatabase::PageGroupIndexedDatabase):
(WebCore::PageGroupIndexedDatabase::from):
(WebCore::PageGroupIndexedDatabase::factoryBackend):
* Modules/indexeddb/PageGroupIndexedDatabase.h:
* Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp:
(WebCore::WorkerGlobalScopeIndexedDatabase::WorkerGlobalScopeIndexedDatabase):
(WebCore::WorkerGlobalScopeIndexedDatabase::from):
(WebCore::WorkerGlobalScopeIndexedDatabase::indexedDB):
* Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h:
* WebCore.exp.in:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:
* dom/DocumentStyleSheetCollection.cpp:
* page/CaptionUserPreferences.cpp:
* page/Frame.cpp:
* page/GroupSettings.cpp: Removed.
* page/GroupSettings.h: Removed.
* page/PageGroup.cpp:
(WebCore::PageGroup::PageGroup):
* page/PageGroup.h:
(WebCore::PageGroup::groupSettings): Deleted.
* platform/DatabaseStrategy.cpp:
(WebCore::DatabaseStrategy::createIDBFactoryBackend):
* platform/DatabaseStrategy.h:
* workers/DedicatedWorkerGlobalScope.cpp:
(WebCore::DedicatedWorkerGlobalScope::create):
(WebCore::DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope):
* workers/DedicatedWorkerGlobalScope.h:
* workers/DedicatedWorkerThread.cpp:
(WebCore::DedicatedWorkerThread::create):
(WebCore::DedicatedWorkerThread::DedicatedWorkerThread):
(WebCore::DedicatedWorkerThread::createWorkerGlobalScope):
* workers/DedicatedWorkerThread.h:
* workers/DefaultSharedWorkerRepository.cpp:
(WebCore::DefaultSharedWorkerRepository::workerScriptLoaded):
(WebCore::SharedWorkerProxy::groupSettings): Deleted.
* workers/SharedWorkerGlobalScope.cpp:
(WebCore::SharedWorkerGlobalScope::create):
(WebCore::SharedWorkerGlobalScope::SharedWorkerGlobalScope):
* workers/SharedWorkerGlobalScope.h:
* workers/SharedWorkerThread.cpp:
(WebCore::SharedWorkerThread::create):
(WebCore::SharedWorkerThread::SharedWorkerThread):
(WebCore::SharedWorkerThread::createWorkerGlobalScope):
* workers/SharedWorkerThread.h:
* workers/WorkerGlobalScope.cpp:
(WebCore::WorkerGlobalScope::WorkerGlobalScope):
* workers/WorkerGlobalScope.h:
(WebCore::WorkerGlobalScope::groupSettings): Deleted.
* workers/WorkerMessagingProxy.cpp:
(WebCore::WorkerMessagingProxy::startWorkerGlobalScope):
* workers/WorkerThread.cpp:
(WebCore::WorkerThreadStartupData::WorkerThreadStartupData):
(WebCore::WorkerThread::WorkerThread):
(WebCore::WorkerThread::workerThread):
* workers/WorkerThread.h:
Source/WebKit2:
Remove unused databaseDirectoryIdentifier parameters.
* WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp:
(WebKit::WebIDBFactoryBackend::WebIDBFactoryBackend):
(WebKit::WebIDBFactoryBackend::getDatabaseNames):
(WebKit::WebIDBFactoryBackend::deleteDatabase):
* WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h:
* WebProcess/Storage/StorageNamespaceImpl.cpp:
* WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
(WebKit::WebPlatformStrategies::createIDBFactoryBackend):
* WebProcess/WebCoreSupport/WebPlatformStrategies.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBFactorycpp">trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBFactoryBackendInterfacecpp">trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBFactoryBackendInterfaceh">trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbPageGroupIndexedDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbPageGroupIndexedDatabaseh">trunk/Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbWorkerGlobalScopeIndexedDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbWorkerGlobalScopeIndexedDatabaseh">trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoredomDocumentStyleSheetCollectioncpp">trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp</a></li>
<li><a href="#trunkSourceWebCorepageCaptionUserPreferencescpp">trunk/Source/WebCore/page/CaptionUserPreferences.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageGroupcpp">trunk/Source/WebCore/page/PageGroup.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageGrouph">trunk/Source/WebCore/page/PageGroup.h</a></li>
<li><a href="#trunkSourceWebCoreplatformDatabaseStrategycpp">trunk/Source/WebCore/platform/DatabaseStrategy.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformDatabaseStrategyh">trunk/Source/WebCore/platform/DatabaseStrategy.h</a></li>
<li><a href="#trunkSourceWebCoreworkersDedicatedWorkerGlobalScopecpp">trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersDedicatedWorkerGlobalScopeh">trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersDedicatedWorkerThreadcpp">trunk/Source/WebCore/workers/DedicatedWorkerThread.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersDedicatedWorkerThreadh">trunk/Source/WebCore/workers/DedicatedWorkerThread.h</a></li>
<li><a href="#trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp">trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersSharedWorkerGlobalScopecpp">trunk/Source/WebCore/workers/SharedWorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersSharedWorkerGlobalScopeh">trunk/Source/WebCore/workers/SharedWorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersSharedWorkerThreadcpp">trunk/Source/WebCore/workers/SharedWorkerThread.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersSharedWorkerThreadh">trunk/Source/WebCore/workers/SharedWorkerThread.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopecpp">trunk/Source/WebCore/workers/WorkerGlobalScope.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerGlobalScopeh">trunk/Source/WebCore/workers/WorkerGlobalScope.h</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerMessagingProxycpp">trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadcpp">trunk/Source/WebCore/workers/WorkerThread.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerThreadh">trunk/Source/WebCore/workers/WorkerThread.h</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="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBFactoryBackendcpp">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBFactoryBackendh">trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessStorageStorageNamespaceImplcpp">trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorepageGroupSettingscpp">trunk/Source/WebCore/page/GroupSettings.cpp</a></li>
<li><a href="#trunkSourceWebCorepageGroupSettingsh">trunk/Source/WebCore/page/GroupSettings.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -1906,7 +1906,6 @@
</span><span class="cx"> page/FrameSnapshotting.cpp
</span><span class="cx"> page/FrameTree.cpp
</span><span class="cx"> page/FrameView.cpp
</span><del>- page/GroupSettings.cpp
</del><span class="cx"> page/History.cpp
</span><span class="cx"> page/Location.cpp
</span><span class="cx"> page/MainFrame.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/ChangeLog 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -1,3 +1,80 @@
</span><ins>+2015-01-01 Sam Weinig <sam@webkit.org>
+
+ Remove GroupSettings
+ https://bugs.webkit.org/show_bug.cgi?id=140037
+
+ Reviewed by Dan Bernstein.
+
+ Nothing sets the values in GroupSettings and nothing uses them.
+ - The indexedDBDatabasePath is accessed and sent to the IndexedDB backend,
+ but the backend then proceeds to not use it.
+
+ * CMakeLists.txt:
+ * Modules/indexeddb/IDBFactory.cpp:
+ (WebCore::IDBFactory::getDatabaseNames):
+ (WebCore::IDBFactory::deleteDatabase):
+ * Modules/indexeddb/IDBFactoryBackendInterface.cpp:
+ (WebCore::IDBFactoryBackendInterface::create):
+ * Modules/indexeddb/IDBFactoryBackendInterface.h:
+ * Modules/indexeddb/PageGroupIndexedDatabase.cpp:
+ (WebCore::PageGroupIndexedDatabase::PageGroupIndexedDatabase):
+ (WebCore::PageGroupIndexedDatabase::from):
+ (WebCore::PageGroupIndexedDatabase::factoryBackend):
+ * Modules/indexeddb/PageGroupIndexedDatabase.h:
+ * Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp:
+ (WebCore::WorkerGlobalScopeIndexedDatabase::WorkerGlobalScopeIndexedDatabase):
+ (WebCore::WorkerGlobalScopeIndexedDatabase::from):
+ (WebCore::WorkerGlobalScopeIndexedDatabase::indexedDB):
+ * Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h:
+ * WebCore.exp.in:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.xcodeproj/project.pbxproj:
+ * dom/DocumentStyleSheetCollection.cpp:
+ * page/CaptionUserPreferences.cpp:
+ * page/Frame.cpp:
+ * page/GroupSettings.cpp: Removed.
+ * page/GroupSettings.h: Removed.
+ * page/PageGroup.cpp:
+ (WebCore::PageGroup::PageGroup):
+ * page/PageGroup.h:
+ (WebCore::PageGroup::groupSettings): Deleted.
+ * platform/DatabaseStrategy.cpp:
+ (WebCore::DatabaseStrategy::createIDBFactoryBackend):
+ * platform/DatabaseStrategy.h:
+ * workers/DedicatedWorkerGlobalScope.cpp:
+ (WebCore::DedicatedWorkerGlobalScope::create):
+ (WebCore::DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope):
+ * workers/DedicatedWorkerGlobalScope.h:
+ * workers/DedicatedWorkerThread.cpp:
+ (WebCore::DedicatedWorkerThread::create):
+ (WebCore::DedicatedWorkerThread::DedicatedWorkerThread):
+ (WebCore::DedicatedWorkerThread::createWorkerGlobalScope):
+ * workers/DedicatedWorkerThread.h:
+ * workers/DefaultSharedWorkerRepository.cpp:
+ (WebCore::DefaultSharedWorkerRepository::workerScriptLoaded):
+ (WebCore::SharedWorkerProxy::groupSettings): Deleted.
+ * workers/SharedWorkerGlobalScope.cpp:
+ (WebCore::SharedWorkerGlobalScope::create):
+ (WebCore::SharedWorkerGlobalScope::SharedWorkerGlobalScope):
+ * workers/SharedWorkerGlobalScope.h:
+ * workers/SharedWorkerThread.cpp:
+ (WebCore::SharedWorkerThread::create):
+ (WebCore::SharedWorkerThread::SharedWorkerThread):
+ (WebCore::SharedWorkerThread::createWorkerGlobalScope):
+ * workers/SharedWorkerThread.h:
+ * workers/WorkerGlobalScope.cpp:
+ (WebCore::WorkerGlobalScope::WorkerGlobalScope):
+ * workers/WorkerGlobalScope.h:
+ (WebCore::WorkerGlobalScope::groupSettings): Deleted.
+ * workers/WorkerMessagingProxy.cpp:
+ (WebCore::WorkerMessagingProxy::startWorkerGlobalScope):
+ * workers/WorkerThread.cpp:
+ (WebCore::WorkerThreadStartupData::WorkerThreadStartupData):
+ (WebCore::WorkerThread::WorkerThread):
+ (WebCore::WorkerThread::workerThread):
+ * workers/WorkerThread.h:
+
</ins><span class="cx"> 2015-01-01 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Tried to fix the iOS build.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactory.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "ExceptionCode.h"
</span><span class="cx"> #include "Frame.h"
</span><del>-#include "GroupSettings.h"
</del><span class="cx"> #include "IDBBindingUtilities.h"
</span><span class="cx"> #include "IDBDatabase.h"
</span><span class="cx"> #include "IDBDatabaseCallbacksImpl.h"
</span><span class="lines">@@ -65,7 +64,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-namespace {
</del><span class="cx"> static bool isContextValid(ScriptExecutionContext* context)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(is<Document>(*context) || context->isWorkerGlobalScope());
</span><span class="lines">@@ -76,20 +74,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static String getIndexedDBDatabasePath(ScriptExecutionContext* context)
-{
- ASSERT(isContextValid(context));
- if (is<Document>(*context)) {
- Document& document = downcast<Document>(*context);
- return document.page()->group().groupSettings().indexedDBDatabasePath();
- }
- const GroupSettings* groupSettings = downcast<WorkerGlobalScope>(*context).groupSettings();
- if (groupSettings)
- return groupSettings->indexedDBDatabasePath();
- return String();
-}
-}
-
</del><span class="cx"> PassRefPtr<IDBRequest> IDBFactory::getDatabaseNames(ScriptExecutionContext* context, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> LOG(StorageAPI, "IDBFactory::getDatabaseNames");
</span><span class="lines">@@ -101,7 +85,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBRequest> request = IDBRequest::create(context, IDBAny::create(this), 0);
</span><del>- m_backend->getDatabaseNames(request, *(context->securityOrigin()), *(context->topOrigin()), context, getIndexedDBDatabasePath(context));
</del><ins>+ m_backend->getDatabaseNames(request, *(context->securityOrigin()), *(context->topOrigin()), context);
</ins><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -157,7 +141,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RefPtr<IDBOpenDBRequest> request = IDBOpenDBRequest::create(context, 0, 0, 0, IndexedDB::VersionNullness::Null);
</span><del>- m_backend->deleteDatabase(name, *context->securityOrigin(), *context->topOrigin(), request, context, getIndexedDBDatabasePath(context));
</del><ins>+ m_backend->deleteDatabase(name, *context->securityOrigin(), *context->topOrigin(), request, context);
</ins><span class="cx"> return request;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBFactoryBackendInterfacecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -35,9 +35,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PassRefPtr<IDBFactoryBackendInterface> IDBFactoryBackendInterface::create(const String& databaseDirectoryIdentifier)
</del><ins>+PassRefPtr<IDBFactoryBackendInterface> IDBFactoryBackendInterface::create()
</ins><span class="cx"> {
</span><del>- return platformStrategies()->databaseStrategy()->createIDBFactoryBackend(databaseDirectoryIdentifier);
</del><ins>+ return platformStrategies()->databaseStrategy()->createIDBFactoryBackend();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBFactoryBackendInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendInterface.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -56,12 +56,12 @@
</span><span class="cx"> // trigger work on a background thread if necessary.
</span><span class="cx"> class IDBFactoryBackendInterface : public RefCounted<IDBFactoryBackendInterface> {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<IDBFactoryBackendInterface> create(const String& databaseDirectoryIdentifier);
</del><ins>+ static PassRefPtr<IDBFactoryBackendInterface> create();
</ins><span class="cx"> virtual ~IDBFactoryBackendInterface() { }
</span><span class="cx">
</span><del>- virtual void getDatabaseNames(PassRefPtr<IDBCallbacks>, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin, ScriptExecutionContext*, const String& dataDir) = 0;
</del><ins>+ virtual void getDatabaseNames(PassRefPtr<IDBCallbacks>, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin, ScriptExecutionContext*) = 0;
</ins><span class="cx"> virtual void open(const String& name, uint64_t version, int64_t transactionId, PassRefPtr<IDBCallbacks>, PassRefPtr<IDBDatabaseCallbacks>, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin) = 0;
</span><del>- virtual void deleteDatabase(const String& name, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin, PassRefPtr<IDBCallbacks>, ScriptExecutionContext*, const String& dataDir) = 0;
</del><ins>+ virtual void deleteDatabase(const String& name, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin, PassRefPtr<IDBCallbacks>, ScriptExecutionContext*) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual void removeIDBDatabaseBackend(const String& uniqueIdentifier) = 0;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbPageGroupIndexedDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -28,14 +28,12 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span><del>-#include "GroupSettings.h"
</del><span class="cx"> #include "IDBFactoryBackendInterface.h"
</span><span class="cx"> #include "PageGroup.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-PageGroupIndexedDatabase::PageGroupIndexedDatabase(const String& databaseDirectoryIdentifier)
- : m_databaseDirectoryIdentifier(databaseDirectoryIdentifier)
</del><ins>+PageGroupIndexedDatabase::PageGroupIndexedDatabase()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -52,7 +50,7 @@
</span><span class="cx"> {
</span><span class="cx"> PageGroupIndexedDatabase* supplement = static_cast<PageGroupIndexedDatabase*>(Supplement<PageGroup>::from(&group, supplementName()));
</span><span class="cx"> if (!supplement) {
</span><del>- auto newSupplement = std::make_unique<PageGroupIndexedDatabase>(group.groupSettings().indexedDBDatabasePath());
</del><ins>+ auto newSupplement = std::make_unique<PageGroupIndexedDatabase>();
</ins><span class="cx"> supplement = newSupplement.get();
</span><span class="cx"> provideTo(&group, supplementName(), WTF::move(newSupplement));
</span><span class="cx"> }
</span><span class="lines">@@ -64,7 +62,7 @@
</span><span class="cx"> // Do not add page setting based access control here since this object is shared by all pages in
</span><span class="cx"> // the group and having per-page controls is misleading.
</span><span class="cx"> if (!m_factoryBackend)
</span><del>- m_factoryBackend = IDBFactoryBackendInterface::create(m_databaseDirectoryIdentifier);
</del><ins>+ m_factoryBackend = IDBFactoryBackendInterface::create();
</ins><span class="cx"> return m_factoryBackend.get();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbPageGroupIndexedDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/Modules/indexeddb/PageGroupIndexedDatabase.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> class PageGroupIndexedDatabase : public Supplement<PageGroup> {
</span><span class="cx"> public:
</span><del>- explicit PageGroupIndexedDatabase(const String& databaseDirectoryIdentifier);
</del><ins>+ explicit PageGroupIndexedDatabase();
</ins><span class="cx"> virtual ~PageGroupIndexedDatabase();
</span><span class="cx">
</span><span class="cx"> static PageGroupIndexedDatabase* from(PageGroup&);
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx"> private:
</span><span class="cx"> static const char* supplementName();
</span><span class="cx">
</span><del>- String m_databaseDirectoryIdentifier;
</del><span class="cx"> RefPtr<IDBFactoryBackendInterface> m_factoryBackend;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbWorkerGlobalScopeIndexedDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -38,8 +38,7 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WorkerGlobalScopeIndexedDatabase::WorkerGlobalScopeIndexedDatabase(const String& databaseDirectoryIdentifier)
- : m_databaseDirectoryIdentifier(databaseDirectoryIdentifier)
</del><ins>+WorkerGlobalScopeIndexedDatabase::WorkerGlobalScopeIndexedDatabase()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -56,12 +55,7 @@
</span><span class="cx"> {
</span><span class="cx"> WorkerGlobalScopeIndexedDatabase* supplement = static_cast<WorkerGlobalScopeIndexedDatabase*>(Supplement<ScriptExecutionContext>::from(context, supplementName()));
</span><span class="cx"> if (!supplement) {
</span><del>- String databaseDirectoryIdentifier;
- const GroupSettings* groupSettings = downcast<WorkerGlobalScope>(*context).groupSettings();
- if (groupSettings)
- databaseDirectoryIdentifier = groupSettings->indexedDBDatabasePath();
-
- auto newSupplement = std::make_unique<WorkerGlobalScopeIndexedDatabase>(databaseDirectoryIdentifier);
</del><ins>+ auto newSupplement = std::make_unique<WorkerGlobalScopeIndexedDatabase>();
</ins><span class="cx"> supplement = newSupplement.get();
</span><span class="cx"> provideTo(context, supplementName(), WTF::move(newSupplement));
</span><span class="cx"> }
</span><span class="lines">@@ -76,7 +70,7 @@
</span><span class="cx"> IDBFactory* WorkerGlobalScopeIndexedDatabase::indexedDB()
</span><span class="cx"> {
</span><span class="cx"> if (!m_factoryBackend)
</span><del>- m_factoryBackend = IDBFactoryBackendInterface::create(m_databaseDirectoryIdentifier);
</del><ins>+ m_factoryBackend = IDBFactoryBackendInterface::create();
</ins><span class="cx"> if (!m_idbFactory)
</span><span class="cx"> m_idbFactory = IDBFactory::create(m_factoryBackend.get());
</span><span class="cx"> return m_idbFactory.get();
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbWorkerGlobalScopeIndexedDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/Modules/indexeddb/WorkerGlobalScopeIndexedDatabase.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx">
</span><span class="cx"> class WorkerGlobalScopeIndexedDatabase : public Supplement<ScriptExecutionContext> {
</span><span class="cx"> public:
</span><del>- explicit WorkerGlobalScopeIndexedDatabase(const String& databaseDirectoryIdentifier);
</del><ins>+ explicit WorkerGlobalScopeIndexedDatabase();
</ins><span class="cx"> virtual ~WorkerGlobalScopeIndexedDatabase();
</span><span class="cx"> static WorkerGlobalScopeIndexedDatabase* from(ScriptExecutionContext*);
</span><span class="cx">
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> IDBFactory* indexedDB();
</span><span class="cx"> static const char* supplementName();
</span><span class="cx">
</span><del>- String m_databaseDirectoryIdentifier;
</del><span class="cx"> RefPtr<IDBFactoryBackendInterface> m_factoryBackend;
</span><span class="cx"> RefPtr<IDBFactory> m_idbFactory;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/WebCore.exp.in 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -684,7 +684,7 @@
</span><span class="cx"> __ZN7WebCore16CSSParserContextC1ERNS_8DocumentERKNS_3URLERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore16CalculationValue6createENSt3__110unique_ptrINS_18CalcExpressionNodeENS1_14default_deleteIS3_EEEENS_30CalculationPermittedValueRangeE
</span><span class="cx"> __ZN7WebCore16DatabaseStrategy17getDatabaseServerEv
</span><del>-__ZN7WebCore16DatabaseStrategy23createIDBFactoryBackendERKN3WTF6StringE
</del><ins>+__ZN7WebCore16DatabaseStrategy23createIDBFactoryBackendEv
</ins><span class="cx"> __ZN7WebCore16DeviceMotionData12Acceleration6createEbdbdbd
</span><span class="cx"> __ZN7WebCore16DeviceMotionData12RotationRate6createEbdbdbd
</span><span class="cx"> __ZN7WebCore16DeviceMotionData6createEN3WTF10PassRefPtrINS0_12AccelerationEEES4_NS2_INS0_12RotationRateEEEbd
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -7209,7 +7209,6 @@
</span><span class="cx"> <ClCompile Include="..\page\FrameSnapshotting.cpp" />
</span><span class="cx"> <ClCompile Include="..\page\FrameTree.cpp" />
</span><span class="cx"> <ClCompile Include="..\page\FrameView.cpp" />
</span><del>- <ClCompile Include="..\page\GroupSettings.cpp" />
</del><span class="cx"> <ClCompile Include="..\page\History.cpp" />
</span><span class="cx"> <ClCompile Include="..\page\animation\ImplicitAnimation.cpp" />
</span><span class="cx"> <ClCompile Include="..\page\animation\KeyframeAnimation.cpp" />
</span><span class="lines">@@ -19213,7 +19212,6 @@
</span><span class="cx"> <ClInclude Include="..\page\FrameSnapshotting.h" />
</span><span class="cx"> <ClInclude Include="..\page\FrameTree.h" />
</span><span class="cx"> <ClInclude Include="..\page\FrameView.h" />
</span><del>- <ClInclude Include="..\page\GroupSettings.h" />
</del><span class="cx"> <ClInclude Include="..\page\History.h" />
</span><span class="cx"> <ClInclude Include="..\page\animation\ImplicitAnimation.h" />
</span><span class="cx"> <ClInclude Include="..\page\animation\KeyframeAnimation.h" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -771,9 +771,6 @@
</span><span class="cx"> <ClCompile Include="..\page\FrameView.cpp">
</span><span class="cx"> <Filter>page</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\page\GroupSettings.cpp">
- <Filter>page</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\page\History.cpp">
</span><span class="cx"> <Filter>page</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -7782,9 +7779,6 @@
</span><span class="cx"> <ClInclude Include="..\page\FrameView.h">
</span><span class="cx"> <Filter>page</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\page\GroupSettings.h">
- <Filter>page</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\page\History.h">
</span><span class="cx"> <Filter>page</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -5561,8 +5561,6 @@
</span><span class="cx"> C400D10918F1C8F60090D863 /* EventLoopInput.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C400D10818F1C8F60090D863 /* EventLoopInput.cpp */; };
</span><span class="cx"> C4CD629A18383766007EBAF1 /* FrameSnapshotting.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C4CD629818383766007EBAF1 /* FrameSnapshotting.cpp */; };
</span><span class="cx"> C4CD629B18383766007EBAF1 /* FrameSnapshotting.h in Headers */ = {isa = PBXBuildFile; fileRef = C4CD629918383766007EBAF1 /* FrameSnapshotting.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- C50B561612119D23008B46E0 /* GroupSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50B561412119D23008B46E0 /* GroupSettings.cpp */; };
- C50B561712119D23008B46E0 /* GroupSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = C50B561512119D23008B46E0 /* GroupSettings.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> C50D0E830FF4272900AC2644 /* StorageNamespace.h in Headers */ = {isa = PBXBuildFile; fileRef = C50D0E810FF4272900AC2644 /* StorageNamespace.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C5137CF211A58378004ADB99 /* JSDOMStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C5137CF011A58378004ADB99 /* JSDOMStringList.cpp */; };
</span><span class="cx"> C5137CF311A58378004ADB99 /* JSDOMStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = C5137CF111A58378004ADB99 /* JSDOMStringList.h */; };
</span><span class="lines">@@ -13022,8 +13020,6 @@
</span><span class="cx"> C400D10818F1C8F60090D863 /* EventLoopInput.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = EventLoopInput.cpp; sourceTree = "<group>"; };
</span><span class="cx"> C4CD629818383766007EBAF1 /* FrameSnapshotting.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FrameSnapshotting.cpp; sourceTree = "<group>"; };
</span><span class="cx"> C4CD629918383766007EBAF1 /* FrameSnapshotting.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FrameSnapshotting.h; sourceTree = "<group>"; };
</span><del>- C50B561412119D23008B46E0 /* GroupSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GroupSettings.cpp; sourceTree = "<group>"; };
- C50B561512119D23008B46E0 /* GroupSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GroupSettings.h; sourceTree = "<group>"; };
</del><span class="cx"> C50D0E810FF4272900AC2644 /* StorageNamespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageNamespace.h; sourceTree = "<group>"; };
</span><span class="cx"> C5137CF011A58378004ADB99 /* JSDOMStringList.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSDOMStringList.cpp; sourceTree = "<group>"; };
</span><span class="cx"> C5137CF111A58378004ADB99 /* JSDOMStringList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSDOMStringList.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -16665,8 +16661,6 @@
</span><span class="cx"> 65A21483097A3F5300B9050A /* FrameTree.h */,
</span><span class="cx"> 65CBFEF70974F607001DAC25 /* FrameView.cpp */,
</span><span class="cx"> 65CBFEF80974F607001DAC25 /* FrameView.h */,
</span><del>- C50B561412119D23008B46E0 /* GroupSettings.cpp */,
- C50B561512119D23008B46E0 /* GroupSettings.h */,
</del><span class="cx"> BC94D1500C275C8B006BC617 /* History.cpp */,
</span><span class="cx"> BC94D1510C275C8B006BC617 /* History.h */,
</span><span class="cx"> BC94D1520C275C8B006BC617 /* History.idl */,
</span><span class="lines">@@ -24505,7 +24499,6 @@
</span><span class="cx"> A12705C31656BD6500C2E27C /* GridPosition.h in Headers */,
</span><span class="cx"> CDF7483F18FEBCEC0006ECC0 /* GridResolvedPosition.h in Headers */,
</span><span class="cx"> A12A1050166444FD008FA311 /* GridTrackSize.h in Headers */,
</span><del>- C50B561712119D23008B46E0 /* GroupSettings.h in Headers */,
</del><span class="cx"> 8482B7461198C35400BFB005 /* HashChangeEvent.h in Headers */,
</span><span class="cx"> A8748BE012CBF2DC001FBA41 /* HashTools.h in Headers */,
</span><span class="cx"> F55B3DC01251F12D003EF269 /* HiddenInputType.h in Headers */,
</span><span class="lines">@@ -28004,7 +27997,6 @@
</span><span class="cx"> 0FA24D79162DF91900A3F4C0 /* GraphicsLayerUpdater.cpp in Sources */,
</span><span class="cx"> B2A015AA0AF6CD53006BCE0E /* GraphicsTypes.cpp in Sources */,
</span><span class="cx"> CDF7483E18FEBCEC0006ECC0 /* GridResolvedPosition.cpp in Sources */,
</span><del>- C50B561612119D23008B46E0 /* GroupSettings.cpp in Sources */,
</del><span class="cx"> F55B3DBF1251F12D003EF269 /* HiddenInputType.cpp in Sources */,
</span><span class="cx"> 51A9D9F3195B9503001B2B5C /* HIDGamepad.cpp in Sources */,
</span><span class="cx"> 5179CE36195CAC7E0019C198 /* HIDGamepadProvider.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentStyleSheetCollectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/dom/DocumentStyleSheetCollection.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> #include "StyleSheetList.h"
</span><span class="cx"> #include "UserContentController.h"
</span><span class="cx"> #include "UserContentURLPattern.h"
</span><ins>+#include "UserStyleSheet.h"
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageCaptionUserPreferencescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/CaptionUserPreferences.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/CaptionUserPreferences.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/page/CaptionUserPreferences.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -35,6 +35,8 @@
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "TextTrackList.h"
</span><span class="cx"> #include "UserContentController.h"
</span><ins>+#include "UserContentTypes.h"
+#include "UserStyleSheet.h"
</ins><span class="cx"> #include "UserStyleSheetTypes.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/page/Frame.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> #include "TextResourceDecoder.h"
</span><span class="cx"> #include "UserContentController.h"
</span><span class="cx"> #include "UserContentURLPattern.h"
</span><ins>+#include "UserScript.h"
</ins><span class="cx"> #include "UserTypingGestureIndicator.h"
</span><span class="cx"> #include "VisibleUnits.h"
</span><span class="cx"> #include "WebKitFontFamilyNames.h"
</span></span></pre></div>
<a id="trunkSourceWebCorepageGroupSettingscpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/page/GroupSettings.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/GroupSettings.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/page/GroupSettings.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "GroupSettings.h"
-
-namespace WebCore {
-
-GroupSettings::GroupSettings()
- : m_localStorageQuotaBytes(5 * 1024 * 1024) // Suggested by the HTML5 spec.
- , m_indexedDBQuotaBytes(5 * 1024 * 1024)
-{
-}
-
-void GroupSettings::setLocalStorageQuotaBytes(unsigned quota)
-{
- m_localStorageQuotaBytes = quota;
-}
-
-void GroupSettings::setIndexedDBDatabasePath(const String& path)
-{
- m_indexedDBDatabasePath = path;
-}
-
-void GroupSettings::setIndexedDBQuotaBytes(int64_t quota)
-{
- m_indexedDBQuotaBytes = quota;
-}
-
-
-} // namespace WebCore
</del></span></pre></div>
<a id="trunkSourceWebCorepageGroupSettingsh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/page/GroupSettings.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/GroupSettings.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/page/GroupSettings.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 Google Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef GroupSettings_h
-#define GroupSettings_h
-
-#include <wtf/text/WTFString.h>
-
-namespace WebCore {
-
-class PageGroup;
-
-class GroupSettings {
- WTF_MAKE_NONCOPYABLE(GroupSettings); WTF_MAKE_FAST_ALLOCATED;
-public:
- GroupSettings();
-
- void setLocalStorageQuotaBytes(unsigned);
- unsigned localStorageQuotaBytes() const { return m_localStorageQuotaBytes; }
-
- void setIndexedDBQuotaBytes(int64_t);
- int64_t indexedDBQuotaBytes() const { return m_indexedDBQuotaBytes; }
-
- void setIndexedDBDatabasePath(const String&);
- const String& indexedDBDatabasePath() const { return m_indexedDBDatabasePath; }
-
-private:
- unsigned m_localStorageQuotaBytes;
- String m_indexedDBDatabasePath;
- int64_t m_indexedDBQuotaBytes;
-};
-
-} // namespace WebCore
-
-#endif // GroupSettings_h
</del></span></pre></div>
<a id="trunkSourceWebCorepagePageGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/page/PageGroup.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "DOMWrapperWorld.h"
</span><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "DocumentStyleSheetCollection.h"
</span><del>-#include "GroupSettings.h"
</del><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageCache.h"
</span><span class="lines">@@ -61,13 +60,11 @@
</span><span class="cx"> PageGroup::PageGroup(const String& name)
</span><span class="cx"> : m_name(name)
</span><span class="cx"> , m_identifier(getUniqueIdentifier())
</span><del>- , m_groupSettings(std::make_unique<GroupSettings>())
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PageGroup::PageGroup(Page& page)
</span><span class="cx"> : m_identifier(getUniqueIdentifier())
</span><del>- , m_groupSettings(std::make_unique<GroupSettings>())
</del><span class="cx"> {
</span><span class="cx"> addPage(page);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageGroup.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageGroup.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/page/PageGroup.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -27,22 +27,14 @@
</span><span class="cx"> #define PageGroup_h
</span><span class="cx">
</span><span class="cx"> #include "Supplementable.h"
</span><del>-#include "UserScript.h"
-#include "UserStyleSheet.h"
</del><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><ins>+#include <wtf/text/WTFString.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class URL;
- class GroupSettings;
- class IDBFactoryBackendInterface;
</del><span class="cx"> class Page;
</span><del>- class SecurityOrigin;
- class StorageNamespace;
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><del>- class CaptionPreferencesChangedListener;
</del><span class="cx"> class CaptionUserPreferences;
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -63,8 +55,6 @@
</span><span class="cx"> const String& name() { return m_name; }
</span><span class="cx"> unsigned identifier() { return m_identifier; }
</span><span class="cx">
</span><del>- GroupSettings& groupSettings() const { return *m_groupSettings; }
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> WEBCORE_EXPORT void captionPreferencesChanged();
</span><span class="cx"> WEBCORE_EXPORT CaptionUserPreferences* captionPreferences();
</span><span class="lines">@@ -76,8 +66,6 @@
</span><span class="cx">
</span><span class="cx"> unsigned m_identifier;
</span><span class="cx">
</span><del>- const std::unique_ptr<GroupSettings> m_groupSettings;
-
</del><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> std::unique_ptr<CaptionUserPreferences> m_captionPreferences;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDatabaseStrategycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DatabaseStrategy.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DatabaseStrategy.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/platform/DatabaseStrategy.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -39,10 +39,9 @@
</span><span class="cx"> #endif // ENABLE(SQL_DATABASE)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><del>-PassRefPtr<IDBFactoryBackendInterface> DatabaseStrategy::createIDBFactoryBackend(const String& databaseDirectoryIdentifier)
</del><ins>+PassRefPtr<IDBFactoryBackendInterface> DatabaseStrategy::createIDBFactoryBackend()
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Need a better platform abstraction here, but this stop gap will work for now.
</span><del>- UNUSED_PARAM(databaseDirectoryIdentifier);
</del><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformDatabaseStrategyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/DatabaseStrategy.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/DatabaseStrategy.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/platform/DatabaseStrategy.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><del>- WEBCORE_EXPORT virtual PassRefPtr<IDBFactoryBackendInterface> createIDBFactoryBackend(const String& databaseDirectoryIdentifier);
</del><ins>+ WEBCORE_EXPORT virtual PassRefPtr<IDBFactoryBackendInterface> createIDBFactoryBackend();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDedicatedWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -39,15 +39,15 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<DedicatedWorkerGlobalScope> DedicatedWorkerGlobalScope::create(const URL& url, const String& userAgent, std::unique_ptr<GroupSettings> settings, DedicatedWorkerThread& thread, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin)
</del><ins>+Ref<DedicatedWorkerGlobalScope> DedicatedWorkerGlobalScope::create(const URL& url, const String& userAgent, DedicatedWorkerThread& thread, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin)
</ins><span class="cx"> {
</span><del>- Ref<DedicatedWorkerGlobalScope> context = adoptRef(*new DedicatedWorkerGlobalScope(url, userAgent, WTF::move(settings), thread, topOrigin));
</del><ins>+ Ref<DedicatedWorkerGlobalScope> context = adoptRef(*new DedicatedWorkerGlobalScope(url, userAgent, thread, topOrigin));
</ins><span class="cx"> context->applyContentSecurityPolicyFromString(contentSecurityPolicy, contentSecurityPolicyType);
</span><span class="cx"> return context;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope(const URL& url, const String& userAgent, std::unique_ptr<GroupSettings> settings, DedicatedWorkerThread& thread, PassRefPtr<SecurityOrigin> topOrigin)
- : WorkerGlobalScope(url, userAgent, WTF::move(settings), thread, topOrigin)
</del><ins>+DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope(const URL& url, const String& userAgent, DedicatedWorkerThread& thread, PassRefPtr<SecurityOrigin> topOrigin)
+ : WorkerGlobalScope(url, userAgent, thread, topOrigin)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDedicatedWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/DedicatedWorkerGlobalScope.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> class DedicatedWorkerGlobalScope : public WorkerGlobalScope {
</span><span class="cx"> public:
</span><span class="cx"> typedef WorkerGlobalScope Base;
</span><del>- static Ref<DedicatedWorkerGlobalScope> create(const URL&, const String& userAgent, std::unique_ptr<GroupSettings>, DedicatedWorkerThread&, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin);
</del><ins>+ static Ref<DedicatedWorkerGlobalScope> create(const URL&, const String& userAgent, DedicatedWorkerThread&, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin);
</ins><span class="cx"> virtual ~DedicatedWorkerGlobalScope();
</span><span class="cx">
</span><span class="cx"> virtual bool isDedicatedWorkerGlobalScope() const override { return true; }
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> DedicatedWorkerThread& thread();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- DedicatedWorkerGlobalScope(const URL&, const String& userAgent, std::unique_ptr<GroupSettings>, DedicatedWorkerThread&, PassRefPtr<SecurityOrigin> topOrigin);
</del><ins>+ DedicatedWorkerGlobalScope(const URL&, const String& userAgent, DedicatedWorkerThread&, PassRefPtr<SecurityOrigin> topOrigin);
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDedicatedWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DedicatedWorkerThread.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DedicatedWorkerThread.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/DedicatedWorkerThread.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -38,13 +38,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<DedicatedWorkerThread> DedicatedWorkerThread::create(const URL& scriptURL, const String& userAgent, const GroupSettings* settings, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* topOrigin)
</del><ins>+Ref<DedicatedWorkerThread> DedicatedWorkerThread::create(const URL& scriptURL, const String& userAgent, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* topOrigin)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DedicatedWorkerThread(scriptURL, userAgent, settings, sourceCode, workerLoaderProxy, workerObjectProxy, startMode, contentSecurityPolicy, contentSecurityPolicyType, topOrigin));
</del><ins>+ return adoptRef(*new DedicatedWorkerThread(scriptURL, userAgent, sourceCode, workerLoaderProxy, workerObjectProxy, startMode, contentSecurityPolicy, contentSecurityPolicyType, topOrigin));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-DedicatedWorkerThread::DedicatedWorkerThread(const URL& url, const String& userAgent, const GroupSettings* settings, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* topOrigin)
- : WorkerThread(url, userAgent, settings, sourceCode, workerLoaderProxy, workerObjectProxy, startMode, contentSecurityPolicy, contentSecurityPolicyType, topOrigin)
</del><ins>+DedicatedWorkerThread::DedicatedWorkerThread(const URL& url, const String& userAgent, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* topOrigin)
+ : WorkerThread(url, userAgent, sourceCode, workerLoaderProxy, workerObjectProxy, startMode, contentSecurityPolicy, contentSecurityPolicyType, topOrigin)
</ins><span class="cx"> , m_workerObjectProxy(workerObjectProxy)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<WorkerGlobalScope> DedicatedWorkerThread::createWorkerGlobalScope(const URL& url, const String& userAgent, std::unique_ptr<GroupSettings> settings, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin)
</del><ins>+Ref<WorkerGlobalScope> DedicatedWorkerThread::createWorkerGlobalScope(const URL& url, const String& userAgent, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin)
</ins><span class="cx"> {
</span><del>- return DedicatedWorkerGlobalScope::create(url, userAgent, WTF::move(settings), *this, contentSecurityPolicy, contentSecurityPolicyType, topOrigin);
</del><ins>+ return DedicatedWorkerGlobalScope::create(url, userAgent, *this, contentSecurityPolicy, contentSecurityPolicyType, topOrigin);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DedicatedWorkerThread::runEventLoop()
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDedicatedWorkerThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DedicatedWorkerThread.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DedicatedWorkerThread.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/DedicatedWorkerThread.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -39,16 +39,16 @@
</span><span class="cx">
</span><span class="cx"> class DedicatedWorkerThread : public WorkerThread {
</span><span class="cx"> public:
</span><del>- static Ref<DedicatedWorkerThread> create(const URL& scriptURL, const String& userAgent, const GroupSettings*, const String& sourceCode, WorkerLoaderProxy&, WorkerObjectProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, const SecurityOrigin* topOrigin);
</del><ins>+ static Ref<DedicatedWorkerThread> create(const URL& scriptURL, const String& userAgent, const String& sourceCode, WorkerLoaderProxy&, WorkerObjectProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, const SecurityOrigin* topOrigin);
</ins><span class="cx"> WorkerObjectProxy& workerObjectProxy() const { return m_workerObjectProxy; }
</span><span class="cx"> virtual ~DedicatedWorkerThread();
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual Ref<WorkerGlobalScope> createWorkerGlobalScope(const URL&, const String& userAgent, std::unique_ptr<GroupSettings>, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, PassRefPtr<SecurityOrigin> topOrigin) override;
</del><ins>+ virtual Ref<WorkerGlobalScope> createWorkerGlobalScope(const URL&, const String& userAgent, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, PassRefPtr<SecurityOrigin> topOrigin) override;
</ins><span class="cx"> virtual void runEventLoop() override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- DedicatedWorkerThread(const URL&, const String& userAgent, const GroupSettings*, const String& sourceCode, WorkerLoaderProxy&, WorkerObjectProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, const SecurityOrigin* topOrigin);
</del><ins>+ DedicatedWorkerThread(const URL&, const String& userAgent, const String& sourceCode, WorkerLoaderProxy&, WorkerObjectProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, const SecurityOrigin* topOrigin);
</ins><span class="cx">
</span><span class="cx"> WorkerObjectProxy& m_workerObjectProxy;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersDefaultSharedWorkerRepositorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/DefaultSharedWorkerRepository.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -88,8 +88,6 @@
</span><span class="cx"> // Removes a detached document from the list of worker's documents. May set the closing flag if this is the last document in the list.
</span><span class="cx"> void documentDetached(Document*);
</span><span class="cx">
</span><del>- GroupSettings* groupSettings() const; // Page GroupSettings used by worker thread.
-
</del><span class="cx"> private:
</span><span class="cx"> SharedWorkerProxy(const String& name, const URL&, PassRefPtr<SecurityOrigin>);
</span><span class="cx"> void close();
</span><span class="lines">@@ -153,19 +151,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-GroupSettings* SharedWorkerProxy::groupSettings() const
-{
- if (isClosing())
- return 0;
- ASSERT(m_workerDocuments.size());
- // Just pick the first active document, and use the groupsettings of that page.
- Document* document = *(m_workerDocuments.begin());
- if (document->page())
- return &document->page()->group().groupSettings();
-
- return 0;
-}
-
</del><span class="cx"> void SharedWorkerProxy::postExceptionToWorkerObject(const String& errorMessage, int lineNumber, int columnNumber, const String& sourceURL)
</span><span class="cx"> {
</span><span class="cx"> MutexLocker lock(m_workerDocumentsLock);
</span><span class="lines">@@ -337,7 +322,7 @@
</span><span class="cx">
</span><span class="cx"> // Another loader may have already started up a thread for this proxy - if so, just send a connect to the pre-existing thread.
</span><span class="cx"> if (!proxy.thread()) {
</span><del>- RefPtr<SharedWorkerThread> thread = SharedWorkerThread::create(proxy.name(), proxy.url(), userAgent, proxy.groupSettings(), workerScript, proxy, proxy, DontPauseWorkerGlobalScopeOnStart, contentSecurityPolicy, contentSecurityPolicyType);
</del><ins>+ RefPtr<SharedWorkerThread> thread = SharedWorkerThread::create(proxy.name(), proxy.url(), userAgent, workerScript, proxy, proxy, DontPauseWorkerGlobalScopeOnStart, contentSecurityPolicy, contentSecurityPolicyType);
</ins><span class="cx"> proxy.setThread(thread);
</span><span class="cx"> thread->start();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersSharedWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/SharedWorkerGlobalScope.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/SharedWorkerGlobalScope.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/SharedWorkerGlobalScope.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -52,15 +52,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // static
</span><del>-Ref<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String& name, const URL& url, const String& userAgent, std::unique_ptr<GroupSettings> settings, SharedWorkerThread& thread, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType)
</del><ins>+Ref<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create(const String& name, const URL& url, const String& userAgent, SharedWorkerThread& thread, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType)
</ins><span class="cx"> {
</span><del>- Ref<SharedWorkerGlobalScope> context = adoptRef(*new SharedWorkerGlobalScope(name, url, userAgent, WTF::move(settings), thread));
</del><ins>+ Ref<SharedWorkerGlobalScope> context = adoptRef(*new SharedWorkerGlobalScope(name, url, userAgent, thread));
</ins><span class="cx"> context->applyContentSecurityPolicyFromString(contentSecurityPolicy, contentSecurityPolicyType);
</span><span class="cx"> return context;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const URL& url, const String& userAgent, std::unique_ptr<GroupSettings> settings, SharedWorkerThread& thread)
- : WorkerGlobalScope(url, userAgent, WTF::move(settings), thread, 0)
</del><ins>+SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const URL& url, const String& userAgent, SharedWorkerThread& thread)
+ : WorkerGlobalScope(url, userAgent, thread, 0)
</ins><span class="cx"> , m_name(name)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersSharedWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/SharedWorkerGlobalScope.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/SharedWorkerGlobalScope.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/SharedWorkerGlobalScope.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -44,7 +44,7 @@
</span><span class="cx"> class SharedWorkerGlobalScope : public WorkerGlobalScope {
</span><span class="cx"> public:
</span><span class="cx"> typedef WorkerGlobalScope Base;
</span><del>- static Ref<SharedWorkerGlobalScope> create(const String& name, const URL&, const String& userAgent, std::unique_ptr<GroupSettings>, SharedWorkerThread&, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType);
</del><ins>+ static Ref<SharedWorkerGlobalScope> create(const String& name, const URL&, const String& userAgent, SharedWorkerThread&, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType);
</ins><span class="cx"> virtual ~SharedWorkerGlobalScope();
</span><span class="cx">
</span><span class="cx"> virtual bool isSharedWorkerGlobalScope() const override { return true; }
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> SharedWorkerThread& thread();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- SharedWorkerGlobalScope(const String& name, const URL&, const String& userAgent, std::unique_ptr<GroupSettings>, SharedWorkerThread&);
</del><ins>+ SharedWorkerGlobalScope(const String& name, const URL&, const String& userAgent, SharedWorkerThread&);
</ins><span class="cx"> virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack>) override;
</span><span class="cx">
</span><span class="cx"> String m_name;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersSharedWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/SharedWorkerThread.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/SharedWorkerThread.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/SharedWorkerThread.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -38,13 +38,13 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-Ref<SharedWorkerThread> SharedWorkerThread::create(const String& name, const URL& scriptURL, const String& userAgent, const GroupSettings* settings, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType)
</del><ins>+Ref<SharedWorkerThread> SharedWorkerThread::create(const String& name, const URL& scriptURL, const String& userAgent, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new SharedWorkerThread(name, scriptURL, userAgent, settings, sourceCode, workerLoaderProxy, workerReportingProxy, startMode, contentSecurityPolicy, contentSecurityPolicyType));
</del><ins>+ return adoptRef(*new SharedWorkerThread(name, scriptURL, userAgent, sourceCode, workerLoaderProxy, workerReportingProxy, startMode, contentSecurityPolicy, contentSecurityPolicyType));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-SharedWorkerThread::SharedWorkerThread(const String& name, const URL& url, const String& userAgent, const GroupSettings* settings, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType)
- : WorkerThread(url, userAgent, settings, sourceCode, workerLoaderProxy, workerReportingProxy, startMode, contentSecurityPolicy, contentSecurityPolicyType, 0)
</del><ins>+SharedWorkerThread::SharedWorkerThread(const String& name, const URL& url, const String& userAgent, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType)
+ : WorkerThread(url, userAgent, sourceCode, workerLoaderProxy, workerReportingProxy, startMode, contentSecurityPolicy, contentSecurityPolicyType, 0)
</ins><span class="cx"> , m_name(name.isolatedCopy())
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -53,9 +53,9 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<WorkerGlobalScope> SharedWorkerThread::createWorkerGlobalScope(const URL& url, const String& userAgent, std::unique_ptr<GroupSettings> settings, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin>)
</del><ins>+Ref<WorkerGlobalScope> SharedWorkerThread::createWorkerGlobalScope(const URL& url, const String& userAgent, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin>)
</ins><span class="cx"> {
</span><del>- return SharedWorkerGlobalScope::create(m_name, url, userAgent, WTF::move(settings), *this, contentSecurityPolicy, contentSecurityPolicyType);
</del><ins>+ return SharedWorkerGlobalScope::create(m_name, url, userAgent, *this, contentSecurityPolicy, contentSecurityPolicyType);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersSharedWorkerThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/SharedWorkerThread.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/SharedWorkerThread.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/SharedWorkerThread.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -39,14 +39,14 @@
</span><span class="cx">
</span><span class="cx"> class SharedWorkerThread : public WorkerThread {
</span><span class="cx"> public:
</span><del>- static Ref<SharedWorkerThread> create(const String& name, const URL&, const String& userAgent, const GroupSettings*, const String& sourceCode, WorkerLoaderProxy&, WorkerReportingProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType);
</del><ins>+ static Ref<SharedWorkerThread> create(const String& name, const URL&, const String& userAgent, const String& sourceCode, WorkerLoaderProxy&, WorkerReportingProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType);
</ins><span class="cx"> virtual ~SharedWorkerThread();
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- virtual Ref<WorkerGlobalScope> createWorkerGlobalScope(const URL&, const String& userAgent, std::unique_ptr<GroupSettings>, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, PassRefPtr<SecurityOrigin> topOrigin) override;
</del><ins>+ virtual Ref<WorkerGlobalScope> createWorkerGlobalScope(const URL&, const String& userAgent, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, PassRefPtr<SecurityOrigin> topOrigin) override;
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- SharedWorkerThread(const String& name, const URL&, const String& userAgent, const GroupSettings*, const String& sourceCode, WorkerLoaderProxy&, WorkerReportingProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType);
</del><ins>+ SharedWorkerThread(const String& name, const URL&, const String& userAgent, const String& sourceCode, WorkerLoaderProxy&, WorkerReportingProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType);
</ins><span class="cx">
</span><span class="cx"> String m_name;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -64,10 +64,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-WorkerGlobalScope::WorkerGlobalScope(const URL& url, const String& userAgent, std::unique_ptr<GroupSettings> settings, WorkerThread& thread, PassRefPtr<SecurityOrigin> topOrigin)
</del><ins>+WorkerGlobalScope::WorkerGlobalScope(const URL& url, const String& userAgent, WorkerThread& thread, PassRefPtr<SecurityOrigin> topOrigin)
</ins><span class="cx"> : m_url(url)
</span><span class="cx"> , m_userAgent(userAgent)
</span><del>- , m_groupSettings(WTF::move(settings))
</del><span class="cx"> , m_script(std::make_unique<WorkerScriptController>(this))
</span><span class="cx"> , m_thread(thread)
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerGlobalScopeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerGlobalScope.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerGlobalScope.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/WorkerGlobalScope.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -30,7 +30,6 @@
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><span class="cx"> #include "EventListener.h"
</span><span class="cx"> #include "EventTarget.h"
</span><del>-#include "GroupSettings.h"
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "WorkerEventQueue.h"
</span><span class="cx"> #include "WorkerScriptController.h"
</span><span class="lines">@@ -66,7 +65,6 @@
</span><span class="cx"> virtual const URL& url() const override final { return m_url; }
</span><span class="cx"> virtual URL completeURL(const String&) const override final;
</span><span class="cx">
</span><del>- const GroupSettings* groupSettings() { return m_groupSettings.get(); }
</del><span class="cx"> virtual String userAgent(const URL&) const override;
</span><span class="cx">
</span><span class="cx"> virtual void disableEval(const String& errorMessage) override;
</span><span class="lines">@@ -141,7 +139,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- WorkerGlobalScope(const URL&, const String& userAgent, std::unique_ptr<GroupSettings>, WorkerThread&, PassRefPtr<SecurityOrigin> topOrigin);
</del><ins>+ WorkerGlobalScope(const URL&, const String& userAgent, WorkerThread&, PassRefPtr<SecurityOrigin> topOrigin);
</ins><span class="cx"> void applyContentSecurityPolicyFromString(const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType);
</span><span class="cx">
</span><span class="cx"> virtual void logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<Inspector::ScriptCallStack>) override;
</span><span class="lines">@@ -162,7 +160,6 @@
</span><span class="cx">
</span><span class="cx"> URL m_url;
</span><span class="cx"> String m_userAgent;
</span><del>- std::unique_ptr<GroupSettings> m_groupSettings;
</del><span class="cx">
</span><span class="cx"> mutable RefPtr<WorkerLocation> m_location;
</span><span class="cx"> mutable RefPtr<WorkerNavigator> m_navigator;
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerMessagingProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/WorkerMessagingProxy.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -84,10 +84,7 @@
</span><span class="cx"> // FIXME: This need to be revisited when we support nested worker one day
</span><span class="cx"> ASSERT(m_scriptExecutionContext);
</span><span class="cx"> Document& document = downcast<Document>(*m_scriptExecutionContext);
</span><del>- GroupSettings* settings = nullptr;
- if (document.page())
- settings = &document.page()->group().groupSettings();
- RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(scriptURL, userAgent, settings, sourceCode, *this, *this, startMode, document.contentSecurityPolicy()->deprecatedHeader(), document.contentSecurityPolicy()->deprecatedHeaderType(), document.topOrigin());
</del><ins>+ RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(scriptURL, userAgent, sourceCode, *this, *this, startMode, document.contentSecurityPolicy()->deprecatedHeader(), document.contentSecurityPolicy()->deprecatedHeaderType(), document.topOrigin());
</ins><span class="cx"> workerThreadCreated(thread);
</span><span class="cx"> thread->start();
</span><span class="cx"> InspectorInstrumentation::didStartWorkerGlobalScope(m_scriptExecutionContext.get(), this, scriptURL);
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/WorkerThread.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -80,11 +80,10 @@
</span><span class="cx"> struct WorkerThreadStartupData {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(WorkerThreadStartupData); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- WorkerThreadStartupData(const URL& scriptURL, const String& userAgent, const GroupSettings*, const String& sourceCode, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* topOrigin);
</del><ins>+ WorkerThreadStartupData(const URL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* topOrigin);
</ins><span class="cx">
</span><span class="cx"> URL m_scriptURL;
</span><span class="cx"> String m_userAgent;
</span><del>- std::unique_ptr<GroupSettings> m_groupSettings;
</del><span class="cx"> String m_sourceCode;
</span><span class="cx"> WorkerThreadStartMode m_startMode;
</span><span class="cx"> String m_contentSecurityPolicy;
</span><span class="lines">@@ -92,7 +91,7 @@
</span><span class="cx"> RefPtr<SecurityOrigin> m_topOrigin;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-WorkerThreadStartupData::WorkerThreadStartupData(const URL& scriptURL, const String& userAgent, const GroupSettings* settings, const String& sourceCode, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* topOrigin)
</del><ins>+WorkerThreadStartupData::WorkerThreadStartupData(const URL& scriptURL, const String& userAgent, const String& sourceCode, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* topOrigin)
</ins><span class="cx"> : m_scriptURL(scriptURL.copy())
</span><span class="cx"> , m_userAgent(userAgent.isolatedCopy())
</span><span class="cx"> , m_sourceCode(sourceCode.isolatedCopy())
</span><span class="lines">@@ -101,20 +100,13 @@
</span><span class="cx"> , m_contentSecurityPolicyType(contentSecurityPolicyType)
</span><span class="cx"> , m_topOrigin(topOrigin ? &topOrigin->isolatedCopy().get() : nullptr)
</span><span class="cx"> {
</span><del>- if (!settings)
- return;
-
- m_groupSettings = std::make_unique<GroupSettings>();
- m_groupSettings->setLocalStorageQuotaBytes(settings->localStorageQuotaBytes());
- m_groupSettings->setIndexedDBQuotaBytes(settings->indexedDBQuotaBytes());
- m_groupSettings->setIndexedDBDatabasePath(settings->indexedDBDatabasePath().isolatedCopy());
</del><span class="cx"> }
</span><span class="cx">
</span><del>-WorkerThread::WorkerThread(const URL& scriptURL, const String& userAgent, const GroupSettings* settings, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* topOrigin)
</del><ins>+WorkerThread::WorkerThread(const URL& scriptURL, const String& userAgent, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* topOrigin)
</ins><span class="cx"> : m_threadID(0)
</span><span class="cx"> , m_workerLoaderProxy(workerLoaderProxy)
</span><span class="cx"> , m_workerReportingProxy(workerReportingProxy)
</span><del>- , m_startupData(std::make_unique<WorkerThreadStartupData>(scriptURL, userAgent, settings, sourceCode, startMode, contentSecurityPolicy, contentSecurityPolicyType, topOrigin))
</del><ins>+ , m_startupData(std::make_unique<WorkerThreadStartupData>(scriptURL, userAgent, sourceCode, startMode, contentSecurityPolicy, contentSecurityPolicyType, topOrigin))
</ins><span class="cx"> #if ENABLE(NOTIFICATIONS) || ENABLE(LEGACY_NOTIFICATIONS)
</span><span class="cx"> , m_notificationClient(0)
</span><span class="cx"> #endif
</span><span class="lines">@@ -159,7 +151,7 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> MutexLocker lock(m_threadCreationMutex);
</span><del>- m_workerGlobalScope = createWorkerGlobalScope(m_startupData->m_scriptURL, m_startupData->m_userAgent, WTF::move(m_startupData->m_groupSettings), m_startupData->m_contentSecurityPolicy, m_startupData->m_contentSecurityPolicyType, m_startupData->m_topOrigin.release());
</del><ins>+ m_workerGlobalScope = createWorkerGlobalScope(m_startupData->m_scriptURL, m_startupData->m_userAgent, m_startupData->m_contentSecurityPolicy, m_startupData->m_contentSecurityPolicyType, m_startupData->m_topOrigin.release());
</ins><span class="cx">
</span><span class="cx"> if (m_runLoop.terminated()) {
</span><span class="cx"> // The worker was terminated before the thread had a chance to run. Since the context didn't exist yet,
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerThread.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerThread.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebCore/workers/WorkerThread.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #define WorkerThread_h
</span><span class="cx">
</span><span class="cx"> #include "ContentSecurityPolicy.h"
</span><del>-#include "GroupSettings.h"
</del><span class="cx"> #include "WorkerRunLoop.h"
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -69,10 +68,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- WorkerThread(const URL&, const String& userAgent, const GroupSettings*, const String& sourceCode, WorkerLoaderProxy&, WorkerReportingProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, const SecurityOrigin* topOrigin);
</del><ins>+ WorkerThread(const URL&, const String& userAgent, const String& sourceCode, WorkerLoaderProxy&, WorkerReportingProxy&, WorkerThreadStartMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, const SecurityOrigin* topOrigin);
</ins><span class="cx">
</span><span class="cx"> // Factory method for creating a new worker context for the thread.
</span><del>- virtual Ref<WorkerGlobalScope> createWorkerGlobalScope(const URL&, const String& userAgent, std::unique_ptr<GroupSettings>, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, PassRefPtr<SecurityOrigin> topOrigin) = 0;
</del><ins>+ virtual Ref<WorkerGlobalScope> createWorkerGlobalScope(const URL&, const String& userAgent, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType, PassRefPtr<SecurityOrigin> topOrigin) = 0;
</ins><span class="cx">
</span><span class="cx"> // Executes the event loop for the worker thread. Derived classes can override to perform actions before/after entering the event loop.
</span><span class="cx"> virtual void runEventLoop();
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -181,6 +181,8 @@
</span><span class="cx"> #import <WebCore/ThreadCheck.h>
</span><span class="cx"> #import <WebCore/UserAgent.h>
</span><span class="cx"> #import <WebCore/UserContentController.h>
</span><ins>+#import <WebCore/UserScript.h>
+#import <WebCore/UserStyleSheet.h>
</ins><span class="cx"> #import <WebCore/WebCoreObjCExtras.h>
</span><span class="cx"> #import <WebCore/WebCoreView.h>
</span><span class="cx"> #import <WebCore/Widget.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebKit2/ChangeLog 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-01 Sam Weinig <sam@webkit.org>
+
+ Remove GroupSettings
+ https://bugs.webkit.org/show_bug.cgi?id=140037
+
+ Reviewed by Dan Bernstein.
+
+ Remove unused databaseDirectoryIdentifier parameters.
+
+ * WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp:
+ (WebKit::WebIDBFactoryBackend::WebIDBFactoryBackend):
+ (WebKit::WebIDBFactoryBackend::getDatabaseNames):
+ (WebKit::WebIDBFactoryBackend::deleteDatabase):
+ * WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h:
+ * WebProcess/Storage/StorageNamespaceImpl.cpp:
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.cpp:
+ (WebKit::WebPlatformStrategies::createIDBFactoryBackend):
+ * WebProcess/WebCoreSupport/WebPlatformStrategies.h:
+
</ins><span class="cx"> 2015-01-01 Jeff Miller <jeffm@apple.com>
</span><span class="cx">
</span><span class="cx"> Update user-visible copyright strings to include 2015
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBFactoryBackendcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> return stringBuilder.toString();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebIDBFactoryBackend::WebIDBFactoryBackend(const String&)
</del><ins>+WebIDBFactoryBackend::WebIDBFactoryBackend()
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBFactoryBackend::getDatabaseNames(PassRefPtr<IDBCallbacks> callbacks, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin, ScriptExecutionContext* context, const String&)
</del><ins>+void WebIDBFactoryBackend::getDatabaseNames(PassRefPtr<IDBCallbacks> callbacks, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin, ScriptExecutionContext* context)
</ins><span class="cx"> {
</span><span class="cx"> LOG(IDB, "WebIDBFactoryBackend::getDatabaseNames");
</span><span class="cx">
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> databaseBackend->openConnection(callbacks, databaseCallbacks, transactionId, version);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebIDBFactoryBackend::deleteDatabase(const String& databaseName, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin, PassRefPtr<IDBCallbacks> callbacks, ScriptExecutionContext*, const String&)
</del><ins>+void WebIDBFactoryBackend::deleteDatabase(const String& databaseName, const SecurityOrigin& openingOrigin, const SecurityOrigin& mainFrameOrigin, PassRefPtr<IDBCallbacks> callbacks, ScriptExecutionContext*)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx"> LOG(IDB, "WebIDBFactoryBackend::deleteDatabase");
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessDatabasesIndexedDBWebIDBFactoryBackendh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebKit2/WebProcess/Databases/IndexedDB/WebIDBFactoryBackend.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -35,18 +35,18 @@
</span><span class="cx">
</span><span class="cx"> class WebIDBFactoryBackend final : public WebCore::IDBFactoryBackendInterface {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<WebIDBFactoryBackend> create(const String& databaseDirectoryIdentifier) { return adoptRef(new WebIDBFactoryBackend(databaseDirectoryIdentifier)); }
</del><ins>+ static PassRefPtr<WebIDBFactoryBackend> create() { return adoptRef(new WebIDBFactoryBackend); }
</ins><span class="cx">
</span><span class="cx"> virtual ~WebIDBFactoryBackend();
</span><span class="cx">
</span><del>- virtual void getDatabaseNames(PassRefPtr<WebCore::IDBCallbacks>, const WebCore::SecurityOrigin& openingOrigin, const WebCore::SecurityOrigin& mainFrameOrigin, WebCore::ScriptExecutionContext*, const String& dataDir) override;
</del><ins>+ virtual void getDatabaseNames(PassRefPtr<WebCore::IDBCallbacks>, const WebCore::SecurityOrigin& openingOrigin, const WebCore::SecurityOrigin& mainFrameOrigin, WebCore::ScriptExecutionContext*) override;
</ins><span class="cx"> virtual void open(const String& name, uint64_t version, int64_t transactionId, PassRefPtr<WebCore::IDBCallbacks>, PassRefPtr<WebCore::IDBDatabaseCallbacks>, const WebCore::SecurityOrigin& openingOrigin, const WebCore::SecurityOrigin& mainFrameOrigin) override;
</span><del>- virtual void deleteDatabase(const String& name, const WebCore::SecurityOrigin& openingOrigin, const WebCore::SecurityOrigin& mainFrameOrigin, PassRefPtr<WebCore::IDBCallbacks>, WebCore::ScriptExecutionContext*, const String& dataDir) override;
</del><ins>+ virtual void deleteDatabase(const String& name, const WebCore::SecurityOrigin& openingOrigin, const WebCore::SecurityOrigin& mainFrameOrigin, PassRefPtr<WebCore::IDBCallbacks>, WebCore::ScriptExecutionContext*) override;
</ins><span class="cx">
</span><span class="cx"> virtual void removeIDBDatabaseBackend(const String& uniqueIdentifier) override;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit WebIDBFactoryBackend(const String& databaseDirectoryIdentifier);
</del><ins>+ explicit WebIDBFactoryBackend();
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessStorageStorageNamespaceImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "WebPage.h"
</span><span class="cx"> #include "WebPageGroupProxy.h"
</span><span class="cx"> #include "WebProcess.h"
</span><del>-#include <WebCore/GroupSettings.h>
</del><span class="cx"> #include <WebCore/PageGroup.h>
</span><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><span class="cx"> #include <WebCore/Settings.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.cpp 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -206,13 +206,13 @@
</span><span class="cx"> #endif // ENABLE(SQL_DATABASE)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><del>-PassRefPtr<IDBFactoryBackendInterface> WebPlatformStrategies::createIDBFactoryBackend(const String& databaseDirectoryIdentifier)
</del><ins>+PassRefPtr<IDBFactoryBackendInterface> WebPlatformStrategies::createIDBFactoryBackend()
</ins><span class="cx"> {
</span><span class="cx"> #if !ENABLE(DATABASE_PROCESS)
</span><del>- return DatabaseStrategy::createIDBFactoryBackend(databaseDirectoryIdentifier);
</del><ins>+ return DatabaseStrategy::createIDBFactoryBackend();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- return WebIDBFactoryBackend::create(databaseDirectoryIdentifier);
</del><ins>+ return WebIDBFactoryBackend::create();
</ins><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebPlatformStrategiesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h (177856 => 177857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2015-01-02 04:41:46 UTC (rev 177856)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebPlatformStrategies.h 2015-01-02 05:26:52 UTC (rev 177857)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> virtual WebCore::AbstractDatabaseServer* getDatabaseServer() override;
</span><span class="cx"> #endif
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><del>- virtual PassRefPtr<WebCore::IDBFactoryBackendInterface> createIDBFactoryBackend(const String& databaseDirectoryIdentifier) override;
</del><ins>+ virtual PassRefPtr<WebCore::IDBFactoryBackendInterface> createIDBFactoryBackend() override;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // WebCore::LoaderStrategy
</span></span></pre>
</div>
</div>
</body>
</html>