<!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>[177090] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/177090">177090</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-10 13:00:09 -0800 (Wed, 10 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Begin fixing transient local storage handling
https://bugs.webkit.org/show_bug.cgi?id=139503
Reviewed by Sam Weinig.
* UIProcess/Storage/StorageManager.cpp:
(WebKit::StorageManager::createTransientLocalStorageMap):
* UIProcess/Storage/StorageManager.h:
Add empty stub implementation of createTransientLocalStorageMap.
* UIProcess/Storage/StorageManager.messages.in:
Add CreateTransientLocalStorageMap message.
* WebProcess/Storage/StorageAreaMap.cpp:
(WebKit::StorageAreaMap::StorageAreaMap):
If we have a local storage namespace with a non-null top-level origin, create a
transient local storage map.
* WebProcess/Storage/StorageNamespaceImpl.cpp:
(WebKit::StorageNamespaceImpl::createLocalStorageNamespace):
Pass a null top-level origin to the StorageNamespaceImpl constructor.
(WebKit::StorageNamespaceImpl::createTransientLocalStorageNamespace):
Create a new StorageNamespaceImpl, passing the top-level origin to the constructor.
(WebKit::StorageNamespaceImpl::createSessionStorageNamespace):
Pass a null top-level origin to the StorageNamespaceImpl constructor.
(WebKit::StorageNamespaceImpl::StorageNamespaceImpl):
Add a top-level origin parameter.
* WebProcess/Storage/StorageNamespaceImpl.h:
(WebKit::StorageNamespaceImpl::topLevelOrigin):
Add top-level origin member and getter.
* WebProcess/Storage/WebStorageNamespaceProvider.cpp:
(WebKit::WebStorageNamespaceProvider::createTransientLocalStorageNamespace):
Call StorageNamespaceImpl::createTransientLocalStorageNamespace.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagerh">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagermessagesin">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in</a></li>
<li><a href="#trunkSourceWebKit2WebProcessStorageStorageAreaMapcpp">trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177089 => 177090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-10 20:46:15 UTC (rev 177089)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-10 21:00:09 UTC (rev 177090)
</span><span class="lines">@@ -1,5 +1,46 @@
</span><span class="cx"> 2014-12-10 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Begin fixing transient local storage handling
+ https://bugs.webkit.org/show_bug.cgi?id=139503
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/Storage/StorageManager.cpp:
+ (WebKit::StorageManager::createTransientLocalStorageMap):
+ * UIProcess/Storage/StorageManager.h:
+ Add empty stub implementation of createTransientLocalStorageMap.
+
+ * UIProcess/Storage/StorageManager.messages.in:
+ Add CreateTransientLocalStorageMap message.
+
+ * WebProcess/Storage/StorageAreaMap.cpp:
+ (WebKit::StorageAreaMap::StorageAreaMap):
+ If we have a local storage namespace with a non-null top-level origin, create a
+ transient local storage map.
+
+ * WebProcess/Storage/StorageNamespaceImpl.cpp:
+ (WebKit::StorageNamespaceImpl::createLocalStorageNamespace):
+ Pass a null top-level origin to the StorageNamespaceImpl constructor.
+
+ (WebKit::StorageNamespaceImpl::createTransientLocalStorageNamespace):
+ Create a new StorageNamespaceImpl, passing the top-level origin to the constructor.
+
+ (WebKit::StorageNamespaceImpl::createSessionStorageNamespace):
+ Pass a null top-level origin to the StorageNamespaceImpl constructor.
+
+ (WebKit::StorageNamespaceImpl::StorageNamespaceImpl):
+ Add a top-level origin parameter.
+
+ * WebProcess/Storage/StorageNamespaceImpl.h:
+ (WebKit::StorageNamespaceImpl::topLevelOrigin):
+ Add top-level origin member and getter.
+
+ * WebProcess/Storage/WebStorageNamespaceProvider.cpp:
+ (WebKit::WebStorageNamespaceProvider::createTransientLocalStorageNamespace):
+ Call StorageNamespaceImpl::createTransientLocalStorageNamespace.
+
+2014-12-10 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Implement WebStorageNamespaceProvider::createLocalStorageNamespace
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139498
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (177089 => 177090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-12-10 20:46:15 UTC (rev 177089)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp 2014-12-10 21:00:09 UTC (rev 177090)
</span><span class="lines">@@ -494,6 +494,11 @@
</span><span class="cx"> result.iterator->value = storageArea.release();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void StorageManager::createTransientLocalStorageMap(IPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& topLevelOriginData, const SecurityOriginData& securityOriginData)
+{
+ // FIXME: Implement this.
+}
+
</ins><span class="cx"> void StorageManager::createSessionStorageMap(IPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& securityOriginData)
</span><span class="cx"> {
</span><span class="cx"> // FIXME: This should be a message check.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h (177089 => 177090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2014-12-10 20:46:15 UTC (rev 177089)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h 2014-12-10 21:00:09 UTC (rev 177090)
</span><span class="lines">@@ -76,6 +76,7 @@
</span><span class="cx">
</span><span class="cx"> // Message handlers.
</span><span class="cx"> void createLocalStorageMap(IPC::Connection*, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData&);
</span><ins>+ void createTransientLocalStorageMap(IPC::Connection*, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData& topLevelOriginData, const SecurityOriginData&);
</ins><span class="cx"> void createSessionStorageMap(IPC::Connection*, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData&);
</span><span class="cx"> void destroyStorageMap(IPC::Connection*, uint64_t storageMapID);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessStorageStorageManagermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in (177089 => 177090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in 2014-12-10 20:46:15 UTC (rev 177089)
+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.messages.in 2014-12-10 21:00:09 UTC (rev 177090)
</span><span class="lines">@@ -22,6 +22,7 @@
</span><span class="cx">
</span><span class="cx"> messages -> StorageManager {
</span><span class="cx"> CreateLocalStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, WebKit::SecurityOriginData securityOriginData) WantsConnection
</span><ins>+ CreateTransientLocalStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, WebKit::SecurityOriginData topLevelSecurityOriginData, WebKit::SecurityOriginData securityOriginData) WantsConnection
</ins><span class="cx"> CreateSessionStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, WebKit::SecurityOriginData securityOriginData) WantsConnection
</span><span class="cx"> DestroyStorageMap(uint64_t storageMapID) WantsConnection
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessStorageStorageAreaMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp (177089 => 177090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp 2014-12-10 20:46:15 UTC (rev 177089)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageAreaMap.cpp 2014-12-10 21:00:09 UTC (rev 177090)
</span><span class="lines">@@ -68,10 +68,20 @@
</span><span class="cx"> , m_hasPendingClear(false)
</span><span class="cx"> , m_hasPendingGetValues(false)
</span><span class="cx"> {
</span><del>- if (m_storageType == LocalStorage)
- WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::CreateLocalStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
- else
</del><ins>+ switch (m_storageType) {
+ case WebCore::LocalStorage:
+ if (SecurityOrigin* topLevelOrigin = storageNamespace->topLevelOrigin())
+ WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::CreateTransientLocalStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(topLevelOrigin), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
+ else
+ WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::CreateLocalStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
+
+ break;
+
+ case WebCore::SessionStorage:
</ins><span class="cx"> WebProcess::shared().parentProcessConnection()->send(Messages::StorageManager::CreateSessionStorageMap(m_storageMapID, storageNamespace->storageNamespaceID(), SecurityOriginData::fromSecurityOrigin(m_securityOrigin.get())), 0);
</span><ins>+ break;
+ }
+
</ins><span class="cx"> WebProcess::shared().addMessageReceiver(Messages::StorageAreaMap::messageReceiverName(), m_storageMapID, *this);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessStorageStorageNamespaceImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp (177089 => 177090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp 2014-12-10 20:46:15 UTC (rev 177089)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.cpp 2014-12-10 21:00:09 UTC (rev 177090)
</span><span class="lines">@@ -49,21 +49,26 @@
</span><span class="cx"> return localStorageNamespaceMap;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes)
</del><ins>+RefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes)
</ins><span class="cx"> {
</span><span class="cx"> LocalStorageNamespaceMap::AddResult result = localStorageNamespaceMap().add(identifier, nullptr);
</span><span class="cx"> if (!result.isNewEntry)
</span><span class="cx"> return result.iterator->value;
</span><span class="cx">
</span><del>- RefPtr<StorageNamespaceImpl> localStorageNamespace = adoptRef(new StorageNamespaceImpl(LocalStorage, identifier, quotaInBytes));
</del><ins>+ RefPtr<StorageNamespaceImpl> localStorageNamespace = adoptRef(new StorageNamespaceImpl(LocalStorage, identifier, nullptr, quotaInBytes));
</ins><span class="cx">
</span><span class="cx"> result.iterator->value = localStorageNamespace.get();
</span><span class="cx"> return localStorageNamespace.release();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createTransientLocalStorageNamespace(uint64_t identifier, WebCore::SecurityOrigin& topLevelOrigin, uint64_t quotaInBytes)
+{
+ return adoptRef(new StorageNamespaceImpl(LocalStorage, identifier, &topLevelOrigin, quotaInBytes));
+}
+
</ins><span class="cx"> PassRefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createSessionStorageNamespace(WebPage* webPage)
</span><span class="cx"> {
</span><del>- return adoptRef(new StorageNamespaceImpl(SessionStorage, webPage->pageID(), webPage->corePage()->settings().sessionStorageQuota()));
</del><ins>+ return adoptRef(new StorageNamespaceImpl(SessionStorage, webPage->pageID(), nullptr, webPage->corePage()->settings().sessionStorageQuota()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StorageNamespaceImpl> StorageNamespaceImpl::createLocalStorageNamespace(PageGroup* pageGroup)
</span><span class="lines">@@ -74,9 +79,10 @@
</span><span class="cx"> return createLocalStorageNamespace(pageGroupID, quota);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-StorageNamespaceImpl::StorageNamespaceImpl(WebCore::StorageType storageType, uint64_t storageNamespaceID, unsigned quotaInBytes)
</del><ins>+StorageNamespaceImpl::StorageNamespaceImpl(WebCore::StorageType storageType, uint64_t storageNamespaceID, WebCore::SecurityOrigin* topLevelOrigin, unsigned quotaInBytes)
</ins><span class="cx"> : m_storageType(storageType)
</span><span class="cx"> , m_storageNamespaceID(storageNamespaceID)
</span><ins>+ , m_topLevelOrigin(topLevelOrigin)
</ins><span class="cx"> , m_quotaInBytes(quotaInBytes)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessStorageStorageNamespaceImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h (177089 => 177090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2014-12-10 20:46:15 UTC (rev 177089)
+++ trunk/Source/WebKit2/WebProcess/Storage/StorageNamespaceImpl.h 2014-12-10 21:00:09 UTC (rev 177090)
</span><span class="lines">@@ -38,19 +38,22 @@
</span><span class="cx">
</span><span class="cx"> class StorageNamespaceImpl : public WebCore::StorageNamespace {
</span><span class="cx"> public:
</span><del>- static PassRefPtr<StorageNamespaceImpl> createLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes);
</del><ins>+ static RefPtr<StorageNamespaceImpl> createLocalStorageNamespace(uint64_t identifier, unsigned quotaInBytes);
+ static RefPtr<StorageNamespaceImpl> createTransientLocalStorageNamespace(uint64_t identifier, WebCore::SecurityOrigin& topLevelOrigin, uint64_t quotaInBytes);
+
</ins><span class="cx"> static PassRefPtr<StorageNamespaceImpl> createSessionStorageNamespace(WebPage*);
</span><span class="cx"> virtual ~StorageNamespaceImpl();
</span><span class="cx">
</span><span class="cx"> WebCore::StorageType storageType() const { return m_storageType; }
</span><span class="cx"> uint64_t storageNamespaceID() const { return m_storageNamespaceID; }
</span><ins>+ WebCore::SecurityOrigin* topLevelOrigin() const { return m_topLevelOrigin.get(); }
</ins><span class="cx"> unsigned quotaInBytes() const { return m_quotaInBytes; }
</span><span class="cx">
</span><span class="cx"> // FIXME: Remove this deprecated overload.
</span><span class="cx"> static PassRefPtr<StorageNamespaceImpl> createLocalStorageNamespace(WebCore::PageGroup*);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- explicit StorageNamespaceImpl(WebCore::StorageType, uint64_t storageNamespaceID, unsigned quotaInBytes);
</del><ins>+ explicit StorageNamespaceImpl(WebCore::StorageType, uint64_t storageNamespaceID, WebCore::SecurityOrigin* topLevelOrigin, unsigned quotaInBytes);
</ins><span class="cx">
</span><span class="cx"> virtual PassRefPtr<WebCore::StorageArea> storageArea(PassRefPtr<WebCore::SecurityOrigin>) override;
</span><span class="cx"> virtual PassRefPtr<WebCore::StorageNamespace> copy(WebCore::Page*) override;
</span><span class="lines">@@ -60,10 +63,14 @@
</span><span class="cx"> virtual void sync() override;
</span><span class="cx"> virtual void closeIdleLocalStorageDatabases() override;
</span><span class="cx">
</span><del>- WebCore::StorageType m_storageType;
- uint64_t m_storageNamespaceID;
- unsigned m_quotaInBytes;
</del><ins>+ const WebCore::StorageType m_storageType;
+ const uint64_t m_storageNamespaceID;
</ins><span class="cx">
</span><ins>+ // Only used for transient local storage namespaces.
+ const RefPtr<WebCore::SecurityOrigin> m_topLevelOrigin;
+
+ const unsigned m_quotaInBytes;
+
</ins><span class="cx"> HashMap<RefPtr<WebCore::SecurityOrigin>, RefPtr<StorageAreaMap>> m_storageAreaMaps;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessStorageWebStorageNamespaceProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp (177089 => 177090)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp 2014-12-10 20:46:15 UTC (rev 177089)
+++ trunk/Source/WebKit2/WebProcess/Storage/WebStorageNamespaceProvider.cpp 2014-12-10 21:00:09 UTC (rev 177090)
</span><span class="lines">@@ -70,10 +70,9 @@
</span><span class="cx"> return StorageNamespaceImpl::createLocalStorageNamespace(m_identifier, quota);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebCore::StorageNamespace> WebStorageNamespaceProvider::createTransientLocalStorageNamespace(WebCore::SecurityOrigin&, unsigned quota)
</del><ins>+RefPtr<WebCore::StorageNamespace> WebStorageNamespaceProvider::createTransientLocalStorageNamespace(WebCore::SecurityOrigin& topLevelOrigin, unsigned quota)
</ins><span class="cx"> {
</span><del>- // FIXME: Implement.
- return nullptr;
</del><ins>+ return StorageNamespaceImpl::createTransientLocalStorageNamespace(m_identifier, topLevelOrigin, quota);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>