<!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>[176976] trunk/Source/WebKit</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/176976">176976</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-08 14:39:27 -0800 (Mon, 08 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebStorageNamespaceProvider should know about its local storage database path
https://bugs.webkit.org/show_bug.cgi?id=139413
Reviewed by Andreas Kling.
Source/WebKit:
* Storage/WebStorageNamespaceProvider.cpp:
(WebStorageNamespaceProvider::create):
(WebStorageNamespaceProvider::WebStorageNamespaceProvider):
* Storage/WebStorageNamespaceProvider.h:
Source/WebKit/mac:
* WebCoreSupport/WebViewGroup.h:
* WebCoreSupport/WebViewGroup.mm:
(WebViewGroup::getOrCreate):
(WebViewGroup::WebViewGroup):
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):
(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
(-[WebView setGroupName:]):
(-[WebView groupName]): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<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="#trunkSourceWebKitmacWebCoreSupportWebViewGrouph">trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebViewGroupmm">trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.mm</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="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (176975 => 176976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-12-08 22:38:23 UTC (rev 176975)
+++ trunk/Source/WebKit/ChangeLog 2014-12-08 22:39:27 UTC (rev 176976)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-12-08 Anders Carlsson <andersca@apple.com>
+
+ WebStorageNamespaceProvider should know about its local storage database path
+ https://bugs.webkit.org/show_bug.cgi?id=139413
+
+ Reviewed by Andreas Kling.
+
+ * Storage/WebStorageNamespaceProvider.cpp:
+ (WebStorageNamespaceProvider::create):
+ (WebStorageNamespaceProvider::WebStorageNamespaceProvider):
+ * Storage/WebStorageNamespaceProvider.h:
+
</ins><span class="cx"> 2014-12-06 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a stubbed out version of WebStorageNamespaceProvider
</span></span></pre></div>
<a id="trunkSourceWebKitStorageWebStorageNamespaceProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp (176975 => 176976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp 2014-12-08 22:38:23 UTC (rev 176975)
+++ trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.cpp 2014-12-08 22:39:27 UTC (rev 176976)
</span><span class="lines">@@ -29,12 +29,13 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><del>-RefPtr<WebStorageNamespaceProvider> WebStorageNamespaceProvider::create()
</del><ins>+RefPtr<WebStorageNamespaceProvider> WebStorageNamespaceProvider::create(const String& localStorageDatabasePath)
</ins><span class="cx"> {
</span><del>- return adoptRef(new WebStorageNamespaceProvider);
</del><ins>+ return adoptRef(new WebStorageNamespaceProvider(localStorageDatabasePath));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-WebStorageNamespaceProvider::WebStorageNamespaceProvider()
</del><ins>+WebStorageNamespaceProvider::WebStorageNamespaceProvider(const String& localStorageDatabasePath)
+ : m_localStorageDatabasePath(localStorageDatabasePath)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitStorageWebStorageNamespaceProviderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h (176975 => 176976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h 2014-12-08 22:38:23 UTC (rev 176975)
+++ trunk/Source/WebKit/Storage/WebStorageNamespaceProvider.h 2014-12-08 22:39:27 UTC (rev 176976)
</span><span class="lines">@@ -30,15 +30,17 @@
</span><span class="cx">
</span><span class="cx"> class WebStorageNamespaceProvider final : public WebCore::StorageNamespaceProvider {
</span><span class="cx"> public:
</span><del>- static RefPtr<WebStorageNamespaceProvider> create();
</del><ins>+ static RefPtr<WebStorageNamespaceProvider> create(const String& localStorageDatabasePath);
</ins><span class="cx"> virtual ~WebStorageNamespaceProvider();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebStorageNamespaceProvider();
</del><ins>+ explicit WebStorageNamespaceProvider(const String& localStorageDatabasePath);
</ins><span class="cx">
</span><span class="cx"> virtual RefPtr<WebCore::StorageNamespace> createSessionStorageNamespace(WebCore::Page&) override;
</span><span class="cx"> virtual RefPtr<WebCore::StorageNamespace> createLocalStorageNamespace() override;
</span><span class="cx"> virtual RefPtr<WebCore::StorageNamespace> createTransientLocalStorageNamespace(WebCore::SecurityOrigin&) override;
</span><ins>+
+ const String m_localStorageDatabasePath;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // WebStorageNamespaceProvider_h
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (176975 => 176976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-08 22:38:23 UTC (rev 176975)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-08 22:39:27 UTC (rev 176976)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-12-08 Anders Carlsson <andersca@apple.com>
+
+ WebStorageNamespaceProvider should know about its local storage database path
+ https://bugs.webkit.org/show_bug.cgi?id=139413
+
+ Reviewed by Andreas Kling.
+
+ * WebCoreSupport/WebViewGroup.h:
+ * WebCoreSupport/WebViewGroup.mm:
+ (WebViewGroup::getOrCreate):
+ (WebViewGroup::WebViewGroup):
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+ (-[WebView setGroupName:]):
+ (-[WebView groupName]): Deleted.
+
</ins><span class="cx"> 2014-12-08 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Fix the WebKit build with the public SDK
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebViewGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.h (176975 => 176976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.h 2014-12-08 22:38:23 UTC (rev 176975)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.h 2014-12-08 22:39:27 UTC (rev 176976)
</span><span class="lines">@@ -38,7 +38,7 @@
</span><span class="cx">
</span><span class="cx"> class WebViewGroup : public RefCounted<WebViewGroup> {
</span><span class="cx"> public:
</span><del>- static RefPtr<WebViewGroup> getOrCreate(const String& name);
</del><ins>+ static RefPtr<WebViewGroup> getOrCreate(const String& name, const String& localStorageDatabasePath);
</ins><span class="cx"> ~WebViewGroup();
</span><span class="cx">
</span><span class="cx"> static WebViewGroup* get(const String& name);
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> WebVisitedLinkStore& visitedLinkStore() { return m_visitedLinkStore.get(); }
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebViewGroup(const String& name);
</del><ins>+ WebViewGroup(const String& name, const String& localStorageDatabasePath);
</ins><span class="cx">
</span><span class="cx"> String m_name;
</span><span class="cx"> HashSet<WebView *> m_webViews;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebViewGroupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.mm (176975 => 176976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.mm 2014-12-08 22:38:23 UTC (rev 176975)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.mm 2014-12-08 22:39:27 UTC (rev 176976)
</span><span class="lines">@@ -42,14 +42,14 @@
</span><span class="cx"> return webViewGroups;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebViewGroup> WebViewGroup::getOrCreate(const String& name)
</del><ins>+RefPtr<WebViewGroup> WebViewGroup::getOrCreate(const String& name, const String& localStorageDatabasePath)
</ins><span class="cx"> {
</span><span class="cx"> if (name.isEmpty())
</span><del>- return adoptRef(new WebViewGroup(String()));
</del><ins>+ return adoptRef(new WebViewGroup(String(), localStorageDatabasePath));
</ins><span class="cx">
</span><span class="cx"> auto& webViewGroup = webViewGroups().add(name, nullptr).iterator->value;
</span><span class="cx"> if (!webViewGroup)
</span><del>- webViewGroup = adoptRef(new WebViewGroup(name));
</del><ins>+ webViewGroup = adoptRef(new WebViewGroup(name, localStorageDatabasePath));
</ins><span class="cx">
</span><span class="cx"> return webViewGroup;
</span><span class="cx"> }
</span><span class="lines">@@ -61,9 +61,9 @@
</span><span class="cx"> return webViewGroups().get(name);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebViewGroup::WebViewGroup(const String& name)
</del><ins>+WebViewGroup::WebViewGroup(const String& name, const String& localStorageDatabasePath)
</ins><span class="cx"> : m_name(name)
</span><del>- , m_storageNamespaceProvider(*WebStorageNamespaceProvider::create())
</del><ins>+ , m_storageNamespaceProvider(*WebStorageNamespaceProvider::create(localStorageDatabasePath))
</ins><span class="cx"> , m_userContentController(*UserContentController::create())
</span><span class="cx"> , m_visitedLinkStore(WebVisitedLinkStore::create())
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (176975 => 176976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-08 22:38:23 UTC (rev 176975)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-08 22:39:27 UTC (rev 176976)
</span><span class="lines">@@ -933,7 +933,7 @@
</span><span class="cx"> didOneTimeInitialization = true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- _private->group = WebViewGroup::getOrCreate(groupName);
</del><ins>+ _private->group = WebViewGroup::getOrCreate(groupName, _private->preferences._localStorageDatabasePath);
</ins><span class="cx"> _private->group->addWebView(self);
</span><span class="cx">
</span><span class="cx"> PageConfiguration pageConfiguration;
</span><span class="lines">@@ -1175,7 +1175,7 @@
</span><span class="cx"> [self addSubview:frameView];
</span><span class="cx"> [frameView release];
</span><span class="cx">
</span><del>- _private->group = WebViewGroup::getOrCreate(groupName);
</del><ins>+ _private->group = WebViewGroup::getOrCreate(groupName, _private->preferences._localStorageDatabasePath);
</ins><span class="cx"> _private->group->addWebView(self);
</span><span class="cx">
</span><span class="cx"> PageConfiguration pageConfiguration;
</span><span class="lines">@@ -6124,7 +6124,7 @@
</span><span class="cx"> if (_private->group)
</span><span class="cx"> _private->group->removeWebView(self);
</span><span class="cx">
</span><del>- _private->group = WebViewGroup::getOrCreate(groupName);
</del><ins>+ _private->group = WebViewGroup::getOrCreate(groupName, _private->preferences._localStorageDatabasePath);
</ins><span class="cx"> _private->group->addWebView(self);
</span><span class="cx">
</span><span class="cx"> if (!_private->page)
</span></span></pre>
</div>
</div>
</body>
</html>