<!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>[176991] trunk/Source/WebKit/mac</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/176991">176991</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-08 16:23:22 -0800 (Mon, 08 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adding user content to a group should force that group to be created
https://bugs.webkit.org/show_bug.cgi?id=139421
rdar://problem/19180108
Reviewed by Sam Weinig.
* WebCoreSupport/WebViewGroup.h:
Store the local storage database path in the group.
* WebCoreSupport/WebViewGroup.mm:
(WebViewGroup::getOrCreate):
If we have an existing group that hasn't had its storage namespace provider created, and the path passed is not empty,
set it. This will ensure that getOrCreate will still work when creating a storage namspace provider.
(WebViewGroup::WebViewGroup):
Initialize the new member variable.
(WebViewGroup::storageNamespaceProvider):
Create the namespace provider lazily.
* WebView/WebView.mm:
(+[WebView _addUserScriptToGroup:world:source:url:whitelist:blacklist:injectionTime:injectedFrames:]):
(+[WebView _addUserStyleSheetToGroup:world:source:url:whitelist:blacklist:injectedFrames:]):
Use getOrCreate instead of get.</pre>
<h3>Modified Paths</h3>
<ul>
<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="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (176990 => 176991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-12-09 00:16:38 UTC (rev 176990)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-09 00:23:22 UTC (rev 176991)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2014-12-08 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Adding user content to a group should force that group to be created
+ https://bugs.webkit.org/show_bug.cgi?id=139421
+ rdar://problem/19180108
+
+ Reviewed by Sam Weinig.
+
+ * WebCoreSupport/WebViewGroup.h:
+ Store the local storage database path in the group.
+
+ * WebCoreSupport/WebViewGroup.mm:
+ (WebViewGroup::getOrCreate):
+ If we have an existing group that hasn't had its storage namespace provider created, and the path passed is not empty,
+ set it. This will ensure that getOrCreate will still work when creating a storage namspace provider.
+
+ (WebViewGroup::WebViewGroup):
+ Initialize the new member variable.
+
+ (WebViewGroup::storageNamespaceProvider):
+ Create the namespace provider lazily.
+
+ * WebView/WebView.mm:
+ (+[WebView _addUserScriptToGroup:world:source:url:whitelist:blacklist:injectionTime:injectedFrames:]):
+ (+[WebView _addUserStyleSheetToGroup:world:source:url:whitelist:blacklist:injectedFrames:]):
+ Use getOrCreate instead of get.
+
+2014-12-08 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> WebStorageNamespaceProvider should know about its local storage database path
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=139413
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebViewGrouph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.h (176990 => 176991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.h 2014-12-09 00:16:38 UTC (rev 176990)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.h 2014-12-09 00:23:22 UTC (rev 176991)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> void addWebView(WebView *);
</span><span class="cx"> void removeWebView(WebView *);
</span><span class="cx">
</span><del>- WebCore::StorageNamespaceProvider& storageNamespaceProvider() { return m_storageNamespaceProvider.get(); }
</del><ins>+ WebCore::StorageNamespaceProvider& storageNamespaceProvider();
</ins><span class="cx"> WebCore::UserContentController& userContentController() { return m_userContentController.get(); }
</span><span class="cx"> WebVisitedLinkStore& visitedLinkStore() { return m_visitedLinkStore.get(); }
</span><span class="cx">
</span><span class="lines">@@ -56,7 +56,9 @@
</span><span class="cx"> String m_name;
</span><span class="cx"> HashSet<WebView *> m_webViews;
</span><span class="cx">
</span><del>- Ref<WebCore::StorageNamespaceProvider> m_storageNamespaceProvider;
</del><ins>+ String m_localStorageDatabasePath;
+ RefPtr<WebCore::StorageNamespaceProvider> m_storageNamespaceProvider;
+
</ins><span class="cx"> Ref<WebCore::UserContentController> m_userContentController;
</span><span class="cx"> Ref<WebVisitedLinkStore> m_visitedLinkStore;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebViewGroupmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.mm (176990 => 176991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.mm 2014-12-09 00:16:38 UTC (rev 176990)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebViewGroup.mm 2014-12-09 00:23:22 UTC (rev 176991)
</span><span class="lines">@@ -50,6 +50,8 @@
</span><span class="cx"> auto& webViewGroup = webViewGroups().add(name, nullptr).iterator->value;
</span><span class="cx"> if (!webViewGroup)
</span><span class="cx"> webViewGroup = adoptRef(new WebViewGroup(name, localStorageDatabasePath));
</span><ins>+ else if (!webViewGroup->m_storageNamespaceProvider && webViewGroup->m_localStorageDatabasePath.isEmpty() && !localStorageDatabasePath.isEmpty())
+ webViewGroup->m_localStorageDatabasePath = localStorageDatabasePath;
</ins><span class="cx">
</span><span class="cx"> return webViewGroup;
</span><span class="cx"> }
</span><span class="lines">@@ -63,7 +65,7 @@
</span><span class="cx">
</span><span class="cx"> WebViewGroup::WebViewGroup(const String& name, const String& localStorageDatabasePath)
</span><span class="cx"> : m_name(name)
</span><del>- , m_storageNamespaceProvider(*WebStorageNamespaceProvider::create(localStorageDatabasePath))
</del><ins>+ , m_localStorageDatabasePath(localStorageDatabasePath)
</ins><span class="cx"> , m_userContentController(*UserContentController::create())
</span><span class="cx"> , m_visitedLinkStore(WebVisitedLinkStore::create())
</span><span class="cx"> {
</span><span class="lines">@@ -88,3 +90,11 @@
</span><span class="cx">
</span><span class="cx"> m_webViews.remove(webView);
</span><span class="cx"> }
</span><ins>+
+StorageNamespaceProvider& WebViewGroup::storageNamespaceProvider()
+{
+ if (!m_storageNamespaceProvider)
+ m_storageNamespaceProvider = WebStorageNamespaceProvider::create(m_localStorageDatabasePath);
+
+ return *m_storageNamespaceProvider;
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (176990 => 176991)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-09 00:16:38 UTC (rev 176990)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-12-09 00:23:22 UTC (rev 176991)
</span><span class="lines">@@ -4023,7 +4023,7 @@
</span><span class="cx"> if (group.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto* viewGroup = WebViewGroup::get(group);
</del><ins>+ auto viewGroup = WebViewGroup::getOrCreate(groupName, String());
</ins><span class="cx"> if (!viewGroup)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -4048,7 +4048,7 @@
</span><span class="cx"> if (group.isEmpty())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto* viewGroup = WebViewGroup::get(group);
</del><ins>+ auto viewGroup = WebViewGroup::getOrCreate(groupName, String());
</ins><span class="cx"> if (!viewGroup)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>