<!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>[177365] trunk/Source/WebCore</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/177365">177365</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-16 10:39:14 -0800 (Tue, 16 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Put some common code in StorageNamespaceProvider
https://bugs.webkit.org/show_bug.cgi?id=139682
Reviewed by Tim Horton.
We have code in two places that gets the local storage area from a given document,
choosing either the local storage namespace or the transient local storage namespace.
Move it to StorageNamespaceProvider::localStorageArea.
* bindings/js/ScriptController.cpp:
* inspector/InspectorDOMStorageAgent.cpp:
(WebCore::InspectorDOMStorageAgent::findStorageArea):
* page/DOMWindow.cpp:
(WebCore::DOMWindow::localStorage):
* page/Navigator.cpp:
* storage/StorageNamespaceProvider.cpp:
(WebCore::StorageNamespaceProvider::localStorageArea):
(WebCore::StorageNamespaceProvider::localStorageNamespace):
* storage/StorageNamespaceProvider.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsScriptControllercpp">trunk/Source/WebCore/bindings/js/ScriptController.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp">trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCorepageNavigatorcpp">trunk/Source/WebCore/page/Navigator.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177364 => 177365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-16 18:36:01 UTC (rev 177364)
+++ trunk/Source/WebCore/ChangeLog 2014-12-16 18:39:14 UTC (rev 177365)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-12-16 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Put some common code in StorageNamespaceProvider
+ https://bugs.webkit.org/show_bug.cgi?id=139682
+
+ Reviewed by Tim Horton.
+
+ We have code in two places that gets the local storage area from a given document,
+ choosing either the local storage namespace or the transient local storage namespace.
+ Move it to StorageNamespaceProvider::localStorageArea.
+
+ * bindings/js/ScriptController.cpp:
+ * inspector/InspectorDOMStorageAgent.cpp:
+ (WebCore::InspectorDOMStorageAgent::findStorageArea):
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::localStorage):
+ * page/Navigator.cpp:
+ * storage/StorageNamespaceProvider.cpp:
+ (WebCore::StorageNamespaceProvider::localStorageArea):
+ (WebCore::StorageNamespaceProvider::localStorageNamespace):
+ * storage/StorageNamespaceProvider.h:
+
+2014-12-16 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Add FeatureCounterKeys.h to the Xcode project.
</span><span class="cx">
</span><span class="cx"> * WebCore.xcodeproj/project.pbxproj:
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsScriptControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/ScriptController.cpp (177364 => 177365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/ScriptController.cpp 2014-12-16 18:36:01 UTC (rev 177364)
+++ trunk/Source/WebCore/bindings/js/ScriptController.cpp 2014-12-16 18:39:14 UTC (rev 177365)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include "ScriptSourceCode.h"
</span><span class="cx"> #include "ScriptableDocumentParser.h"
</span><span class="cx"> #include "Settings.h"
</span><del>-#include "StorageNamespace.h"
</del><span class="cx"> #include "UserGestureIndicator.h"
</span><span class="cx"> #include "WebCoreJSClientData.h"
</span><span class="cx"> #include "npruntime_impl.h"
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorDOMStorageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp (177364 => 177365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2014-12-16 18:36:01 UTC (rev 177364)
+++ trunk/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp 2014-12-16 18:39:14 UTC (rev 177365)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx"> #include "PageGroup.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "Storage.h"
</span><del>-#include "StorageNamespace.h"
</del><span class="cx"> #include "StorageNamespaceProvider.h"
</span><span class="cx"> #include "VoidCallback.h"
</span><span class="cx"> #include <inspector/InspectorFrontendDispatchers.h>
</span><span class="lines">@@ -201,14 +200,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- Page* page = m_pageAgent->page();
- Document* document = targetFrame->document();
- if (isLocalStorage) {
- if (document->securityOrigin()->canAccessLocalStorage(document->topOrigin()))
- return page->storageNamespaceProvider().localStorageNamespace().storageArea(document->securityOrigin());
- return page->storageNamespaceProvider().transientLocalStorageNamespace(*document->topOrigin()).storageArea(document->securityOrigin());
- }
- return page->sessionStorage()->storageArea(document->securityOrigin());
</del><ins>+ return m_pageAgent->page()->storageNamespaceProvider().localStorageArea(*targetFrame->document());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (177364 => 177365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2014-12-16 18:36:01 UTC (rev 177364)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2014-12-16 18:39:14 UTC (rev 177365)
</span><span class="lines">@@ -856,13 +856,8 @@
</span><span class="cx"> if (!page->settings().localStorageEnabled())
</span><span class="cx"> return nullptr;
</span><span class="cx">
</span><del>- RefPtr<StorageArea> storageArea;
</del><ins>+ RefPtr<StorageArea> storageArea = page->storageNamespaceProvider().localStorageArea(*document);
</ins><span class="cx">
</span><del>- if (document->securityOrigin()->canAccessLocalStorage(document->topOrigin()))
- storageArea = page->storageNamespaceProvider().localStorageNamespace().storageArea(document->securityOrigin());
- else
- storageArea = page->storageNamespaceProvider().transientLocalStorageNamespace(*document->topOrigin()).storageArea(document->securityOrigin());
-
</del><span class="cx"> if (!storageArea->canAccessStorage(m_frame)) {
</span><span class="cx"> ec = SECURITY_ERR;
</span><span class="cx"> return nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCorepageNavigatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Navigator.cpp (177364 => 177365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Navigator.cpp 2014-12-16 18:36:01 UTC (rev 177364)
+++ trunk/Source/WebCore/page/Navigator.cpp 2014-12-16 18:39:14 UTC (rev 177365)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "ScriptController.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include "Settings.h"
</span><del>-#include "StorageNamespace.h"
</del><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/NumberOfCores.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespaceProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageNamespaceProvider.cpp (177364 => 177365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespaceProvider.cpp 2014-12-16 18:36:01 UTC (rev 177364)
+++ trunk/Source/WebCore/storage/StorageNamespaceProvider.cpp 2014-12-16 18:39:14 UTC (rev 177365)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "StorageNamespaceProvider.h"
</span><span class="cx">
</span><ins>+#include "Document.h"
+#include "StorageArea.h"
</ins><span class="cx"> #include "StorageNamespace.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -56,6 +58,13 @@
</span><span class="cx"> m_pages.remove(&page);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RefPtr<StorageArea> StorageNamespaceProvider::localStorageArea(Document& document)
+{
+ auto& storageNamespace = document.securityOrigin()->canAccessLocalStorage(document.topOrigin()) ? localStorageNamespace() : transientLocalStorageNamespace(*document.topOrigin());
+
+ return storageNamespace.storageArea(document.securityOrigin());
+}
+
</ins><span class="cx"> StorageNamespace& StorageNamespaceProvider::localStorageNamespace()
</span><span class="cx"> {
</span><span class="cx"> if (!m_localStorageNamespace)
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespaceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageNamespaceProvider.h (177364 => 177365)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespaceProvider.h 2014-12-16 18:36:01 UTC (rev 177364)
+++ trunk/Source/WebCore/storage/StorageNamespaceProvider.h 2014-12-16 18:39:14 UTC (rev 177365)
</span><span class="lines">@@ -34,8 +34,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+class Document;
</ins><span class="cx"> class Page;
</span><span class="cx"> class SecurityOrigin;
</span><ins>+class StorageArea;
</ins><span class="cx"> class StorageNamespace;
</span><span class="cx">
</span><span class="cx"> class StorageNamespaceProvider : public RefCounted<StorageNamespaceProvider> {
</span><span class="lines">@@ -44,8 +46,7 @@
</span><span class="cx"> virtual ~StorageNamespaceProvider();
</span><span class="cx">
</span><span class="cx"> virtual RefPtr<StorageNamespace> createSessionStorageNamespace(Page&, unsigned quota) = 0;
</span><del>- StorageNamespace& localStorageNamespace();
- StorageNamespace& transientLocalStorageNamespace(SecurityOrigin&);
</del><ins>+ RefPtr<StorageArea> localStorageArea(Document&);
</ins><span class="cx">
</span><span class="cx"> void addPage(Page&);
</span><span class="cx"> void removePage(Page&);
</span><span class="lines">@@ -54,6 +55,9 @@
</span><span class="cx"> StorageNamespace* optionalLocalStorageNamespace() { return m_localStorageNamespace.get(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><ins>+ StorageNamespace& localStorageNamespace();
+ StorageNamespace& transientLocalStorageNamespace(SecurityOrigin&);
+
</ins><span class="cx"> virtual RefPtr<StorageNamespace> createLocalStorageNamespace(unsigned quota) = 0;
</span><span class="cx"> virtual RefPtr<StorageNamespace> createTransientLocalStorageNamespace(SecurityOrigin&, unsigned quota) = 0;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>