<!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>[176992] 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/176992">176992</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-08 16:28:25 -0800 (Mon, 08 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebStorageNamespaceProvider should create StorageNamespaceImpls
https://bugs.webkit.org/show_bug.cgi?id=139419
Reviewed by Andreas Kling.
Source/WebCore:
* WebCore.exp.in:
Export new symbols.
* WebCore.xcodeproj/project.pbxproj:
Make StorageNamespaceImpl.h a private header.
* storage/StorageNamespaceImpl.cpp:
(WebCore::localStorageNamespaceMap):
Use NeverDestroyed.
(WebCore::StorageNamespaceImpl::createSessionStorageNamespace):
(WebCore::StorageNamespaceImpl::getOrCreateLocalStorageNamespace):
Add new functions for creating namespaces.
(WebCore::StorageNamespaceImpl::localStorageNamespace):
(WebCore::StorageNamespaceImpl::sessionStorageNamespace):
Call the new functions.
* storage/StorageNamespaceImpl.h:
Add new members, make sure to deprecate the ones we don't want anyone calling.
* storage/StorageNamespaceProvider.cpp:
(WebCore::StorageNamespaceProvider::localStorageNamespace):
(WebCore::StorageNamespaceProvider::transientLocalStorageNamespace):
* storage/StorageNamespaceProvider.h:
Pass the quota when creating storage namespaces.
Source/WebKit:
* Storage/WebStorageNamespaceProvider.cpp:
(WebStorageNamespaceProvider::createLocalStorageNamespace):
(WebStorageNamespaceProvider::createTransientLocalStorageNamespace):
Create StorageNamespaceImpls.
(WebStorageNamespaceProvider::createSessionStorageNamespace): Deleted.
Delete this for now.
* Storage/WebStorageNamespaceProvider.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorestorageStorageNamespaceImplcpp">trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageNamespaceImplh">trunk/Source/WebCore/storage/StorageNamespaceImpl.h</a></li>
<li><a href="#trunkSourceWebCorestorageStorageNamespaceProvidercpp">trunk/Source/WebCore/storage/StorageNamespaceProvider.cpp</a></li>
<li><a href="#trunkSourceWebCorestorageStorageNamespaceProviderh">trunk/Source/WebCore/storage/StorageNamespaceProvider.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitStorageWebStorageNamespaceProvidercpp">trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp</a></li>
<li><a href="#trunkSourceWebKitStorageWebStorageNamespaceProviderh">trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176991 => 176992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-09 00:23:22 UTC (rev 176991)
+++ trunk/Source/WebCore/ChangeLog 2014-12-09 00:28:25 UTC (rev 176992)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-12-08 Anders Carlsson <andersca@apple.com>
+
+ WebStorageNamespaceProvider should create StorageNamespaceImpls
+ https://bugs.webkit.org/show_bug.cgi?id=139419
+
+ Reviewed by Andreas Kling.
+
+ * WebCore.exp.in:
+ Export new symbols.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ Make StorageNamespaceImpl.h a private header.
+
+ * storage/StorageNamespaceImpl.cpp:
+ (WebCore::localStorageNamespaceMap):
+ Use NeverDestroyed.
+
+ (WebCore::StorageNamespaceImpl::createSessionStorageNamespace):
+ (WebCore::StorageNamespaceImpl::getOrCreateLocalStorageNamespace):
+ Add new functions for creating namespaces.
+
+ (WebCore::StorageNamespaceImpl::localStorageNamespace):
+ (WebCore::StorageNamespaceImpl::sessionStorageNamespace):
+ Call the new functions.
+
+ * storage/StorageNamespaceImpl.h:
+ Add new members, make sure to deprecate the ones we don't want anyone calling.
+
+ * storage/StorageNamespaceProvider.cpp:
+ (WebCore::StorageNamespaceProvider::localStorageNamespace):
+ (WebCore::StorageNamespaceProvider::transientLocalStorageNamespace):
+ * storage/StorageNamespaceProvider.h:
+ Pass the quota when creating storage namespaces.
+
</ins><span class="cx"> 2014-12-08 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Move the new :nth-child() and :nth-last-child() out of experimental
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (176991 => 176992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-12-09 00:23:22 UTC (rev 176991)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-12-09 00:28:25 UTC (rev 176992)
</span><span class="lines">@@ -898,6 +898,8 @@
</span><span class="cx"> __ZN7WebCore20ResourceResponseBase24setExpectedContentLengthEx
</span><span class="cx"> __ZN7WebCore20ResourceResponseBase6setURLERKNS_3URLE
</span><span class="cx"> __ZN7WebCore20ResourceResponseBaseC2Ev
</span><ins>+__ZN7WebCore20StorageNamespaceImpl29createSessionStorageNamespaceEj
+__ZN7WebCore20StorageNamespaceImpl32getOrCreateLocalStorageNamespaceERKN3WTF6StringEj
</ins><span class="cx"> __ZN7WebCore20TransformationMatrix5scaleEd
</span><span class="cx"> __ZN7WebCore20TransformationMatrix9translateEdd
</span><span class="cx"> __ZN7WebCore20UserGestureIndicator7s_stateE
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (176991 => 176992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-12-09 00:23:22 UTC (rev 176991)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-12-09 00:28:25 UTC (rev 176992)
</span><span class="lines">@@ -5554,7 +5554,7 @@
</span><span class="cx"> C544274B11A57E7A0063A749 /* DOMStringList.h in Headers */ = {isa = PBXBuildFile; fileRef = C544274911A57E7A0063A749 /* DOMStringList.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> C55610F111A704EB00B82D27 /* DOMStringList.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C55610F011A704EB00B82D27 /* DOMStringList.cpp */; };
</span><span class="cx"> C55C7BA11718AFBA001327E4 /* RenderThemeIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = C55C7BA01718AFBA001327E4 /* RenderThemeIOS.mm */; };
</span><del>- C55E38BF10040D5D00A56BDB /* StorageNamespaceImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */; };
</del><ins>+ C55E38BF10040D5D00A56BDB /* StorageNamespaceImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = C55E38BB10040D5D00A56BDB /* StorageNamespaceImpl.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> C55E38C010040D5D00A56BDB /* StorageNamespaceImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C55E38BC10040D5D00A56BDB /* StorageNamespaceImpl.cpp */; };
</span><span class="cx"> C572EE1F1201C9BC007D8F82 /* JSIDBIndex.h in Headers */ = {isa = PBXBuildFile; fileRef = C572EE1D1201C9BC007D8F82 /* JSIDBIndex.h */; };
</span><span class="cx"> C57FEDE11212EE9C0097BE65 /* FileSystem.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C57FEDE01212EE9C0097BE65 /* FileSystem.cpp */; };
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespaceImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp (176991 => 176992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp 2014-12-09 00:23:22 UTC (rev 176991)
+++ trunk/Source/WebCore/storage/StorageNamespaceImpl.cpp 2014-12-09 00:28:25 UTC (rev 176992)
</span><span class="lines">@@ -36,19 +36,37 @@
</span><span class="cx"> #include "StorageSyncManager.h"
</span><span class="cx"> #include "StorageTracker.h"
</span><span class="cx"> #include <wtf/MainThread.h>
</span><del>-#include <wtf/StdLibExtras.h>
</del><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-typedef HashMap<String, StorageNamespace*> LocalStorageNamespaceMap;
</del><ins>+static HashMap<String, StorageNamespaceImpl*> localStorageNamespaceMap()
+{
+ static NeverDestroyed<HashMap<String, StorageNamespaceImpl*>> localStorageNamespaceMap;
</ins><span class="cx">
</span><del>-static LocalStorageNamespaceMap& localStorageNamespaceMap()
-{
- DEPRECATED_DEFINE_STATIC_LOCAL(LocalStorageNamespaceMap, localStorageNamespaceMap, ());
</del><span class="cx"> return localStorageNamespaceMap;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createSessionStorageNamespace(unsigned quota)
+{
+ return adoptRef(new StorageNamespaceImpl(SessionStorage, String(), quota));
+}
+
+RefPtr<StorageNamespaceImpl> StorageNamespaceImpl::getOrCreateLocalStorageNamespace(const String& databasePath, unsigned quota)
+{
+ ASSERT(!databasePath.isNull());
+
+ auto& slot = localStorageNamespaceMap().add(databasePath, nullptr).iterator->value;
+ if (slot)
+ return slot;
+
+ RefPtr<StorageNamespaceImpl> storageNamespace = adoptRef(new StorageNamespaceImpl(LocalStorage, databasePath, quota));
+ slot = storageNamespace.get();
+
+ return storageNamespace;
+}
+
</ins><span class="cx"> PassRefPtr<StorageNamespace> StorageNamespaceImpl::localStorageNamespace(PageGroup* pageGroup)
</span><span class="cx"> {
</span><span class="cx"> // Need a page in this page group to query the settings for the local storage database path.
</span><span class="lines">@@ -60,19 +78,12 @@
</span><span class="cx"> unsigned quota = pageGroup->groupSettings().localStorageQuotaBytes();
</span><span class="cx"> const String lookupPath = path.isNull() ? emptyString() : path;
</span><span class="cx">
</span><del>- LocalStorageNamespaceMap::AddResult result = localStorageNamespaceMap().add(lookupPath, nullptr);
- if (!result.isNewEntry)
- return result.iterator->value;
-
- RefPtr<StorageNamespace> storageNamespace = adoptRef(new StorageNamespaceImpl(LocalStorage, lookupPath, quota));
-
- result.iterator->value = storageNamespace.get();
- return storageNamespace.release();
</del><ins>+ return getOrCreateLocalStorageNamespace(path.isNull() ? emptyString() : path, quota);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StorageNamespace> StorageNamespaceImpl::sessionStorageNamespace(Page* page)
</span><span class="cx"> {
</span><del>- return adoptRef(new StorageNamespaceImpl(SessionStorage, String(), page->settings().sessionStorageQuota()));
</del><ins>+ return createSessionStorageNamespace(page->settings().sessionStorageQuota());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StorageNamespace> StorageNamespaceImpl::transientLocalStorageNamespace(PageGroup* pageGroup, SecurityOrigin*)
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespaceImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageNamespaceImpl.h (176991 => 176992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespaceImpl.h 2014-12-09 00:23:22 UTC (rev 176991)
+++ trunk/Source/WebCore/storage/StorageNamespaceImpl.h 2014-12-09 00:28:25 UTC (rev 176992)
</span><span class="lines">@@ -39,9 +39,8 @@
</span><span class="cx">
</span><span class="cx"> class StorageNamespaceImpl : public StorageNamespace {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<StorageNamespace> localStorageNamespace(PageGroup*);
- static PassRefPtr<StorageNamespace> transientLocalStorageNamespace(PageGroup*, SecurityOrigin*);
- static PassRefPtr<StorageNamespace> sessionStorageNamespace(Page*);
</del><ins>+ static RefPtr<StorageNamespaceImpl> createSessionStorageNamespace(unsigned quota);
+ static RefPtr<StorageNamespaceImpl> getOrCreateLocalStorageNamespace(const String& databasePath, unsigned quota);
</ins><span class="cx"> virtual ~StorageNamespaceImpl();
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<StorageArea> storageArea(PassRefPtr<SecurityOrigin>) override;
</span><span class="lines">@@ -57,6 +56,11 @@
</span><span class="cx"> virtual void sync() override;
</span><span class="cx"> virtual void closeIdleLocalStorageDatabases() override;
</span><span class="cx">
</span><ins>+ // FIXME: These are all deprecated and should not be called by anyone.
+ static PassRefPtr<StorageNamespace> localStorageNamespace(PageGroup*);
+ static PassRefPtr<StorageNamespace> transientLocalStorageNamespace(PageGroup*, SecurityOrigin*);
+ static PassRefPtr<StorageNamespace> sessionStorageNamespace(Page*);
+
</ins><span class="cx"> private:
</span><span class="cx"> StorageNamespaceImpl(StorageType, const String& path, unsigned quota);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespaceProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageNamespaceProvider.cpp (176991 => 176992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespaceProvider.cpp 2014-12-09 00:23:22 UTC (rev 176991)
+++ trunk/Source/WebCore/storage/StorageNamespaceProvider.cpp 2014-12-09 00:28:25 UTC (rev 176992)
</span><span class="lines">@@ -30,6 +30,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+// Suggested by the HTML5 spec.
+unsigned localStorageDatabaseQuotaInBytes = 5 * 1024 * 1024;
+
</ins><span class="cx"> StorageNamespaceProvider::StorageNamespaceProvider()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -56,7 +59,7 @@
</span><span class="cx"> StorageNamespace& StorageNamespaceProvider::localStorageNamespace()
</span><span class="cx"> {
</span><span class="cx"> if (!m_localStorageNamespace)
</span><del>- m_localStorageNamespace = createLocalStorageNamespace();
</del><ins>+ m_localStorageNamespace = createLocalStorageNamespace(localStorageDatabaseQuotaInBytes);
</ins><span class="cx">
</span><span class="cx"> return *m_localStorageNamespace;
</span><span class="cx"> }
</span><span class="lines">@@ -65,7 +68,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto& slot = m_transientLocalStorageMap.add(&securityOrigin, nullptr).iterator->value;
</span><span class="cx"> if (!slot)
</span><del>- slot = createTransientLocalStorageNamespace(securityOrigin);
</del><ins>+ slot = createTransientLocalStorageNamespace(securityOrigin, localStorageDatabaseQuotaInBytes);
</ins><span class="cx">
</span><span class="cx"> return *slot;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespaceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageNamespaceProvider.h (176991 => 176992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespaceProvider.h 2014-12-09 00:23:22 UTC (rev 176991)
+++ trunk/Source/WebCore/storage/StorageNamespaceProvider.h 2014-12-09 00:28:25 UTC (rev 176992)
</span><span class="lines">@@ -45,14 +45,13 @@
</span><span class="cx">
</span><span class="cx"> StorageNamespace& localStorageNamespace();
</span><span class="cx"> StorageNamespace& transientLocalStorageNamespace(SecurityOrigin&);
</span><del>- virtual RefPtr<StorageNamespace> createSessionStorageNamespace(Page&) = 0;
</del><span class="cx">
</span><span class="cx"> void addPage(Page&);
</span><span class="cx"> void removePage(Page&);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual RefPtr<StorageNamespace> createLocalStorageNamespace() = 0;
- virtual RefPtr<StorageNamespace> createTransientLocalStorageNamespace(SecurityOrigin&) = 0;
</del><ins>+ virtual RefPtr<StorageNamespace> createLocalStorageNamespace(unsigned quota) = 0;
+ virtual RefPtr<StorageNamespace> createTransientLocalStorageNamespace(SecurityOrigin&, unsigned quota) = 0;
</ins><span class="cx">
</span><span class="cx"> HashSet<Page*> m_pages;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (176991 => 176992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-12-09 00:23:22 UTC (rev 176991)
+++ trunk/Source/WebKit/ChangeLog 2014-12-09 00:28:25 UTC (rev 176992)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2014-12-08 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ WebStorageNamespaceProvider should create StorageNamespaceImpls
+ https://bugs.webkit.org/show_bug.cgi?id=139419
+
+ Reviewed by Andreas Kling.
+
+ * Storage/WebStorageNamespaceProvider.cpp:
+ (WebStorageNamespaceProvider::createLocalStorageNamespace):
+ (WebStorageNamespaceProvider::createTransientLocalStorageNamespace):
+ Create StorageNamespaceImpls.
+
+ (WebStorageNamespaceProvider::createSessionStorageNamespace): Deleted.
+ Delete this for now.
+
+ * Storage/WebStorageNamespaceProvider.h:
+
+2014-12-08 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> WebStorageNamespaceProvider should know about its local storage database path
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139413
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitStorageWebStorageNamespaceProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp (176991 => 176992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp 2014-12-09 00:23:22 UTC (rev 176991)
+++ trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp 2014-12-09 00:28:25 UTC (rev 176992)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx">
</span><span class="cx"> #include "WebStorageNamespaceProvider.h"
</span><span class="cx">
</span><del>-#include <WebCore/StorageNamespace.h>
</del><ins>+#include <WebCore/StorageNamespaceImpl.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -43,20 +43,14 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<StorageNamespace> WebStorageNamespaceProvider::createSessionStorageNamespace(Page&)
</del><ins>+RefPtr<StorageNamespace> WebStorageNamespaceProvider::createLocalStorageNamespace(unsigned quota)
</ins><span class="cx"> {
</span><del>- // FIXME: Implement.
- return nullptr;
</del><ins>+ return StorageNamespaceImpl::getOrCreateLocalStorageNamespace(m_localStorageDatabasePath, quota);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<StorageNamespace> WebStorageNamespaceProvider::createLocalStorageNamespace()
</del><ins>+RefPtr<StorageNamespace> WebStorageNamespaceProvider::createTransientLocalStorageNamespace(SecurityOrigin&, unsigned quota)
</ins><span class="cx"> {
</span><del>- // FIXME: Implement.
- return nullptr;
</del><ins>+ // FIXME: A smarter implementation would create a special namespace type instead of just piggy-backing off
+ // SessionStorageNamespace here.
+ return StorageNamespaceImpl::createSessionStorageNamespace(quota);
</ins><span class="cx"> }
</span><del>-
-RefPtr<StorageNamespace> WebStorageNamespaceProvider::createTransientLocalStorageNamespace(SecurityOrigin&)
-{
- // FIXME: Implement.
- return nullptr;
-}
</del></span></pre></div>
<a id="trunkSourceWebKitStorageWebStorageNamespaceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h (176991 => 176992)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h 2014-12-09 00:23:22 UTC (rev 176991)
+++ trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h 2014-12-09 00:28:25 UTC (rev 176992)
</span><span class="lines">@@ -36,9 +36,8 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit WebStorageNamespaceProvider(const String& localStorageDatabasePath);
</span><span class="cx">
</span><del>- virtual RefPtr<WebCore::StorageNamespace> createSessionStorageNamespace(WebCore::Page&) override;
- virtual RefPtr<WebCore::StorageNamespace> createLocalStorageNamespace() override;
- virtual RefPtr<WebCore::StorageNamespace> createTransientLocalStorageNamespace(WebCore::SecurityOrigin&) override;
</del><ins>+ virtual RefPtr<WebCore::StorageNamespace> createLocalStorageNamespace(unsigned quota) override;
+ virtual RefPtr<WebCore::StorageNamespace> createTransientLocalStorageNamespace(WebCore::SecurityOrigin&, unsigned quota) override;
</ins><span class="cx">
</span><span class="cx"> const String m_localStorageDatabasePath;
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>