<!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>[177102] 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/177102">177102</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-10 14:48:07 -0800 (Wed, 10 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add session storage handling to StorageNamespaceProvider
https://bugs.webkit.org/show_bug.cgi?id=139507
Reviewed by Tim Horton.
Source/WebCore:
* page/Page.cpp:
(WebCore::Page::sessionStorage):
* storage/StorageNamespaceProvider.h:
Source/WebKit:
* Storage/WebStorageNamespaceProvider.cpp:
(WebStorageNamespaceProvider::createSessionStorageNamespace):
* Storage/WebStorageNamespaceProvider.h:
Source/WebKit2:
* WebProcess/Storage/StorageNamespaceImpl.cpp:
(WebKit::StorageNamespaceImpl::createSessionStorageNamespace):
* WebProcess/Storage/StorageNamespaceImpl.h:
* WebProcess/Storage/WebStorageNamespaceProvider.cpp:
(WebKit::WebStorageNamespaceProvider::createSessionStorageNamespace):
* WebProcess/Storage/WebStorageNamespaceProvider.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.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>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessStorageStorageNamespaceImplcpp">trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessStorageStorageNamespaceImplh">trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessStorageWebStorageNamespaceProvidercpp">trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessStorageWebStorageNamespaceProviderh">trunk/Source/WebKit2/WebProcess/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 (177101 => 177102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-12-10 22:33:15 UTC (rev 177101)
+++ trunk/Source/WebCore/ChangeLog        2014-12-10 22:48:07 UTC (rev 177102)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-12-10 Anders Carlsson <andersca@apple.com>
+
+ Add session storage handling to StorageNamespaceProvider
+ https://bugs.webkit.org/show_bug.cgi?id=139507
+
+ Reviewed by Tim Horton.
+
+ * page/Page.cpp:
+ (WebCore::Page::sessionStorage):
+ * storage/StorageNamespaceProvider.h:
+
</ins><span class="cx"> 2014-12-10 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Follow-up patch to r177099.
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (177101 => 177102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp        2014-12-10 22:33:15 UTC (rev 177101)
+++ trunk/Source/WebCore/page/Page.cpp        2014-12-10 22:48:07 UTC (rev 177102)
</span><span class="lines">@@ -1090,8 +1090,12 @@
</span><span class="cx">
</span><span class="cx"> StorageNamespace* Page::sessionStorage(bool optionalCreate)
</span><span class="cx"> {
</span><del>- if (!m_sessionStorage && optionalCreate)
- m_sessionStorage = StorageNamespace::sessionStorageNamespace(this);
</del><ins>+ if (!m_sessionStorage && optionalCreate) {
+ if (m_storageNamespaceProvider)
+ m_sessionStorage = m_storageNamespaceProvider->createSessionStorageNamespace(*this, m_settings->sessionStorageQuota());
+ else
+ m_sessionStorage = StorageNamespace::sessionStorageNamespace(this);
+ }
</ins><span class="cx">
</span><span class="cx"> return m_sessionStorage.get();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespaceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageNamespaceProvider.h (177101 => 177102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespaceProvider.h        2014-12-10 22:33:15 UTC (rev 177101)
+++ trunk/Source/WebCore/storage/StorageNamespaceProvider.h        2014-12-10 22:48:07 UTC (rev 177102)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> StorageNamespaceProvider();
</span><span class="cx"> virtual ~StorageNamespaceProvider();
</span><span class="cx">
</span><ins>+ virtual RefPtr<StorageNamespace> createSessionStorageNamespace(Page&, unsigned quota) = 0;
</ins><span class="cx"> StorageNamespace& localStorageNamespace();
</span><span class="cx"> StorageNamespace& transientLocalStorageNamespace(SecurityOrigin&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (177101 => 177102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog        2014-12-10 22:33:15 UTC (rev 177101)
+++ trunk/Source/WebKit/ChangeLog        2014-12-10 22:48:07 UTC (rev 177102)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2014-12-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Add session storage handling to StorageNamespaceProvider
+ https://bugs.webkit.org/show_bug.cgi?id=139507
+
+ Reviewed by Tim Horton.
+
+ * Storage/WebStorageNamespaceProvider.cpp:
+ (WebStorageNamespaceProvider::createSessionStorageNamespace):
+ * Storage/WebStorageNamespaceProvider.h:
+
+2014-12-10 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Add WebStorageNamespaceProvider::closeLocalStorage
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139502
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitStorageWebStorageNamespaceProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp (177101 => 177102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp        2014-12-10 22:33:15 UTC (rev 177101)
+++ trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp        2014-12-10 22:48:07 UTC (rev 177102)
</span><span class="lines">@@ -62,6 +62,11 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<StorageNamespace> WebStorageNamespaceProvider::createSessionStorageNamespace(Page&, unsigned quota)
+{
+ return StorageNamespaceImpl::createSessionStorageNamespace(quota);
+}
+
</ins><span class="cx"> RefPtr<StorageNamespace> WebStorageNamespaceProvider::createLocalStorageNamespace(unsigned quota)
</span><span class="cx"> {
</span><span class="cx"> return StorageNamespaceImpl::getOrCreateLocalStorageNamespace(m_localStorageDatabasePath, quota);
</span></span></pre></div>
<a id="trunkSourceWebKitStorageWebStorageNamespaceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h (177101 => 177102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h        2014-12-10 22:33:15 UTC (rev 177101)
+++ trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h        2014-12-10 22:48:07 UTC (rev 177102)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit WebStorageNamespaceProvider(const String& localStorageDatabasePath);
</span><span class="cx">
</span><ins>+ virtual RefPtr<WebCore::StorageNamespace> createSessionStorageNamespace(WebCore::Page&, unsigned quota) override;
</ins><span class="cx"> virtual RefPtr<WebCore::StorageNamespace> createLocalStorageNamespace(unsigned quota) override;
</span><span class="cx"> virtual RefPtr<WebCore::StorageNamespace> createTransientLocalStorageNamespace(WebCore::SecurityOrigin&, unsigned quota) override;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177101 => 177102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-12-10 22:33:15 UTC (rev 177101)
+++ trunk/Source/WebKit2/ChangeLog        2014-12-10 22:48:07 UTC (rev 177102)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-12-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Add session storage handling to StorageNamespaceProvider
+ https://bugs.webkit.org/show_bug.cgi?id=139507
+
+ Reviewed by Tim Horton.
+
+ * WebProcess/Storage/StorageNamespaceImpl.cpp:
+ (WebKit::StorageNamespaceImpl::createSessionStorageNamespace):
+ * WebProcess/Storage/StorageNamespaceImpl.h:
+ * WebProcess/Storage/WebStorageNamespaceProvider.cpp:
+ (WebKit::WebStorageNamespaceProvider::createSessionStorageNamespace):
+ * WebProcess/Storage/WebStorageNamespaceProvider.h:
+
+2014-12-10 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Implement the rest of the transient local storage namespace code
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139505
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessStorageStorageNamespaceImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp (177101 => 177102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp        2014-12-10 22:33:15 UTC (rev 177101)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp        2014-12-10 22:48:07 UTC (rev 177102)
</span><span class="lines">@@ -49,6 +49,11 @@
</span><span class="cx"> return localStorageNamespaceMap;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createSessionStorageNamespace(uint64_t identifier, unsigned quotaInBytes)
+{
+ return adoptRef(new StorageNamespaceImpl(SessionStorage, identifier, nullptr, quotaInBytes));
+}
+
</ins><span class="cx"> RefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes)
</span><span class="cx"> {
</span><span class="cx"> LocalStorageNamespaceMap::AddResult result = localStorageNamespaceMap().add(identifier, nullptr);
</span><span class="lines">@@ -68,7 +73,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createSessionStorageNamespace(WebPage* webPage)
</span><span class="cx"> {
</span><del>- return adoptRef(new StorageNamespaceImpl(SessionStorage, webPage->pageID(), nullptr, webPage->corePage()->settings().sessionStorageQuota()));
</del><ins>+ return createSessionStorageNamespace(webPage->pageID(), webPage->corePage()->settings().sessionStorageQuota());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createLocalStorageNamespace(PageGroup* pageGroup)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessStorageStorageNamespaceImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h (177101 => 177102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h        2014-12-10 22:33:15 UTC (rev 177101)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h        2014-12-10 22:48:07 UTC (rev 177102)
</span><span class="lines">@@ -38,10 +38,10 @@
</span><span class="cx">
</span><span class="cx"> class StorageNamespaceImpl : public WebCore::StorageNamespace {
</span><span class="cx"> public:
</span><ins>+ static RefPtr<StorageNamespaceImpl> createSessionStorageNamespace(uint64_t identifier, unsigned quotaInBytes);
</ins><span class="cx"> static RefPtr<StorageNamespaceImpl> createLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes);
</span><span class="cx"> static RefPtr<StorageNamespaceImpl> createTransientLocalStorageNamespace(uint64_t identifier, WebCore::SecurityOrigin& topLevelOrigin, uint64_t quotaInBytes);
</span><span class="cx">
</span><del>- static PassRefPtr<StorageNamespaceImpl> createSessionStorageNamespace(WebPage*);
</del><span class="cx"> virtual ~StorageNamespaceImpl();
</span><span class="cx">
</span><span class="cx"> WebCore::StorageType storageType() const { return m_storageType; }
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove this deprecated overload.
</span><span class="cx"> static PassRefPtr<StorageNamespaceImpl> createLocalStorageNamespace(WebCore::PageGroup*);
</span><ins>+ static PassRefPtr<StorageNamespaceImpl> createSessionStorageNamespace(WebPage*);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> explicit StorageNamespaceImpl(WebCore::StorageType, uint64_t storageNamespaceID, WebCore::SecurityOrigin* topLevelOrigin, unsigned quotaInBytes);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessStorageWebStorageNamespaceProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp (177101 => 177102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp        2014-12-10 22:33:15 UTC (rev 177101)
+++ trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp        2014-12-10 22:48:07 UTC (rev 177102)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #include "WebStorageNamespaceProvider.h"
</span><span class="cx">
</span><span class="cx"> #include "StorageNamespaceImpl.h"
</span><ins>+#include "WebPage.h"
</ins><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="lines">@@ -65,6 +66,11 @@
</span><span class="cx"> storageNamespaceProviders().remove(m_identifier);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<WebCore::StorageNamespace> WebStorageNamespaceProvider::createSessionStorageNamespace(Page& page, unsigned quota)
+{
+ return StorageNamespaceImpl::createSessionStorageNamespace(WebPage::fromCorePage(&page)->pageID(), quota);
+}
+
</ins><span class="cx"> RefPtr<WebCore::StorageNamespace> WebStorageNamespaceProvider::createLocalStorageNamespace(unsigned quota)
</span><span class="cx"> {
</span><span class="cx"> return StorageNamespaceImpl::createLocalStorageNamespace(m_identifier, quota);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessStorageWebStorageNamespaceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.h (177101 => 177102)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.h        2014-12-10 22:33:15 UTC (rev 177101)
+++ trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.h        2014-12-10 22:48:07 UTC (rev 177102)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> private:
</span><span class="cx"> explicit WebStorageNamespaceProvider(uint64_t identifier);
</span><span class="cx">
</span><ins>+ virtual RefPtr<WebCore::StorageNamespace> createSessionStorageNamespace(WebCore::Page&, unsigned quota) override;
</ins><span class="cx"> virtual RefPtr<WebCore::StorageNamespace> createLocalStorageNamespace(unsigned quota) override;
</span><span class="cx"> virtual RefPtr<WebCore::StorageNamespace> createTransientLocalStorageNamespace(WebCore::SecurityOrigin&, unsigned quota) override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>