<!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>[177087] 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/177087">177087</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-10 12:10:02 -0800 (Wed, 10 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add WebStorageNamespaceProvider::closeLocalStorage
https://bugs.webkit.org/show_bug.cgi?id=139502
Reviewed by Tim Horton.
Source/WebCore:
* page/Page.cpp:
(WebCore::Page::~Page):
Call StorageNamespaceProvider::removePage.
* storage/StorageNamespaceProvider.h:
(WebCore::StorageNamespaceProvider::optionalLocalStorageNamespace):
Helper function that returns the local storage namespace if one exists.
Source/WebKit:
* Storage/WebStorageNamespaceProvider.cpp:
(storageNamespaceProviders):
(WebStorageNamespaceProvider::WebStorageNamespaceProvider):
(WebStorageNamespaceProvider::~WebStorageNamespaceProvider):
Keep track of all live storage namespace providers.
(WebStorageNamespaceProvider::closeLocalStorage):
Loop through all storage namespace providers and call close() on their local storage namespaces.
* Storage/WebStorageNamespaceProvider.h:
Source/WebKit/mac:
* WebView/WebView.mm:
(+[WebView _applicationWillTerminate]):
Call WebStorageNamespaceProvider::closeLocalStorage.</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="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (177086 => 177087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-10 19:57:33 UTC (rev 177086)
+++ trunk/Source/WebCore/ChangeLog 2014-12-10 20:10:02 UTC (rev 177087)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-12-10 Anders Carlsson <andersca@apple.com>
+
+ Add WebStorageNamespaceProvider::closeLocalStorage
+ https://bugs.webkit.org/show_bug.cgi?id=139502
+
+ Reviewed by Tim Horton.
+
+ * page/Page.cpp:
+ (WebCore::Page::~Page):
+ Call StorageNamespaceProvider::removePage.
+
+ * storage/StorageNamespaceProvider.h:
+ (WebCore::StorageNamespaceProvider::optionalLocalStorageNamespace):
+ Helper function that returns the local storage namespace if one exists.
+
</ins><span class="cx"> 2014-12-10 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [ATK] MathML tokens with text fail to expose their text content via AtkText
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (177086 => 177087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2014-12-10 19:57:33 UTC (rev 177086)
+++ trunk/Source/WebCore/page/Page.cpp 2014-12-10 20:10:02 UTC (rev 177087)
</span><span class="lines">@@ -271,6 +271,7 @@
</span><span class="cx"> pageCounter.decrement();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ m_storageNamespaceProvider->removePage(*this);
</ins><span class="cx"> if (m_userContentController)
</span><span class="cx"> m_userContentController->removePage(*this);
</span><span class="cx"> m_visitedLinkStore->removePage(*this);
</span></span></pre></div>
<a id="trunkSourceWebCorestorageStorageNamespaceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/storage/StorageNamespaceProvider.h (177086 => 177087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/storage/StorageNamespaceProvider.h 2014-12-10 19:57:33 UTC (rev 177086)
+++ trunk/Source/WebCore/storage/StorageNamespaceProvider.h 2014-12-10 20:10:02 UTC (rev 177087)
</span><span class="lines">@@ -49,6 +49,9 @@
</span><span class="cx"> void addPage(Page&);
</span><span class="cx"> void removePage(Page&);
</span><span class="cx">
</span><ins>+protected:
+ StorageNamespace* optionalLocalStorageNamespace() { return m_localStorageNamespace.get(); }
+
</ins><span class="cx"> private:
</span><span class="cx"> virtual RefPtr<StorageNamespace> createLocalStorageNamespace(unsigned quota) = 0;
</span><span class="cx"> virtual RefPtr<StorageNamespace> createTransientLocalStorageNamespace(SecurityOrigin&, unsigned quota) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (177086 => 177087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-12-10 19:57:33 UTC (rev 177086)
+++ trunk/Source/WebKit/ChangeLog 2014-12-10 20:10:02 UTC (rev 177087)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-12-10 Anders Carlsson <andersca@apple.com>
+
+ Add WebStorageNamespaceProvider::closeLocalStorage
+ https://bugs.webkit.org/show_bug.cgi?id=139502
+
+ Reviewed by Tim Horton.
+
+ * Storage/WebStorageNamespaceProvider.cpp:
+ (storageNamespaceProviders):
+ (WebStorageNamespaceProvider::WebStorageNamespaceProvider):
+ (WebStorageNamespaceProvider::~WebStorageNamespaceProvider):
+ Keep track of all live storage namespace providers.
+
+ (WebStorageNamespaceProvider::closeLocalStorage):
+ Loop through all storage namespace providers and call close() on their local storage namespaces.
+
+ * Storage/WebStorageNamespaceProvider.h:
+
</ins><span class="cx"> 2014-12-09 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r177037.
</span></span></pre></div>
<a id="trunkSourceWebKitStorageWebStorageNamespaceProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp (177086 => 177087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp 2014-12-10 19:57:33 UTC (rev 177086)
+++ trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp 2014-12-10 20:10:02 UTC (rev 177087)
</span><span class="lines">@@ -26,9 +26,17 @@
</span><span class="cx"> #include "WebStorageNamespaceProvider.h"
</span><span class="cx">
</span><span class="cx"> #include <WebCore/StorageNamespaceImpl.h>
</span><ins>+#include <wtf/NeverDestroyed.h>
</ins><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><ins>+static HashSet<WebStorageNamespaceProvider*>& storageNamespaceProviders()
+{
+ static NeverDestroyed<HashSet<WebStorageNamespaceProvider*>> storageNamespaceProviders;
+
+ return storageNamespaceProviders;
+}
+
</ins><span class="cx"> RefPtr<WebStorageNamespaceProvider> WebStorageNamespaceProvider::create(const String& localStorageDatabasePath)
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebStorageNamespaceProvider(localStorageDatabasePath));
</span><span class="lines">@@ -37,12 +45,23 @@
</span><span class="cx"> WebStorageNamespaceProvider::WebStorageNamespaceProvider(const String& localStorageDatabasePath)
</span><span class="cx"> : m_localStorageDatabasePath(localStorageDatabasePath)
</span><span class="cx"> {
</span><ins>+ storageNamespaceProviders().add(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebStorageNamespaceProvider::~WebStorageNamespaceProvider()
</span><span class="cx"> {
</span><ins>+ ASSERT(storageNamespaceProviders().contains(this));
+ storageNamespaceProviders().remove(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebStorageNamespaceProvider::closeLocalStorage()
+{
+ for (const auto& storageNamespaceProvider : storageNamespaceProviders()) {
+ if (auto* localStorageNamespace = storageNamespaceProvider->optionalLocalStorageNamespace())
+ localStorageNamespace->close();
+ }
+}
+
</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 (177086 => 177087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h 2014-12-10 19:57:33 UTC (rev 177086)
+++ trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h 2014-12-10 20:10:02 UTC (rev 177087)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx"> static RefPtr<WebStorageNamespaceProvider> create(const String& localStorageDatabasePath);
</span><span class="cx"> virtual ~WebStorageNamespaceProvider();
</span><span class="cx">
</span><ins>+ static void closeLocalStorage();
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit WebStorageNamespaceProvider(const String& localStorageDatabasePath);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (177086 => 177087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-10 19:57:33 UTC (rev 177086)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-10 20:10:02 UTC (rev 177087)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-12-10 Anders Carlsson <andersca@apple.com>
+
+ Add WebStorageNamespaceProvider::closeLocalStorage
+ https://bugs.webkit.org/show_bug.cgi?id=139502
+
+ Reviewed by Tim Horton.
+
+ * WebView/WebView.mm:
+ (+[WebView _applicationWillTerminate]):
+ Call WebStorageNamespaceProvider::closeLocalStorage.
+
</ins><span class="cx"> 2014-12-09 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r177037.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (177086 => 177087)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-10 19:57:33 UTC (rev 177086)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-10 20:10:02 UTC (rev 177087)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> #import "WebScriptWorldInternal.h"
</span><span class="cx"> #import "WebSelectionServiceController.h"
</span><span class="cx"> #import "WebStorageManagerInternal.h"
</span><ins>+#import "WebStorageNamespaceProvider.h"
</ins><span class="cx"> #import "WebSystemInterface.h"
</span><span class="cx"> #import "WebTextCompletionController.h"
</span><span class="cx"> #import "WebTextIterator.h"
</span><span class="lines">@@ -4791,6 +4792,7 @@
</span><span class="cx"> if (!pluginDatabaseClientCount)
</span><span class="cx"> [WebPluginDatabase closeSharedDatabase];
</span><span class="cx">
</span><ins>+ WebStorageNamespaceProvider::closeLocalStorage();
</ins><span class="cx"> PageGroup::closeLocalStorage();
</span><span class="cx"> }
</span><span class="cx"> #endif // !PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>