<!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>[177020] 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/177020">177020</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-09 09:16:12 -0800 (Tue, 09 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Give WebsiteDataStore a unique ID
https://bugs.webkit.org/show_bug.cgi?id=139448
Reviewed by Andreas Kling.
* Shared/WebPageCreationParameters.cpp:
(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):
* Shared/WebPageCreationParameters.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::creationParameters):
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::generateIdentifier):
(WebKit::WebsiteDataStore::WebsiteDataStore):
* UIProcess/WebsiteData/WebsiteDataStore.h:
(WebKit::WebsiteDataStore::identifier):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParameterscpp">trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParametersh">trunk/Source/WebKit2/Shared/WebPageCreationParameters.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177019 => 177020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog        2014-12-09 17:11:18 UTC (rev 177019)
+++ trunk/Source/WebKit2/ChangeLog        2014-12-09 17:16:12 UTC (rev 177020)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2014-12-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Give WebsiteDataStore a unique ID
+ https://bugs.webkit.org/show_bug.cgi?id=139448
+
+ Reviewed by Andreas Kling.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::creationParameters):
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::generateIdentifier):
+ (WebKit::WebsiteDataStore::WebsiteDataStore):
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ (WebKit::WebsiteDataStore::identifier):
+
+2014-12-09 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Build fix.
</span><span class="cx">
</span><span class="cx"> * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParameterscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (177019 => 177020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp        2014-12-09 17:11:18 UTC (rev 177019)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp        2014-12-09 17:16:12 UTC (rev 177020)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> encoder << highestUsedBackForwardItemID;
</span><span class="cx"> encoder << userContentControllerID;
</span><span class="cx"> encoder << visitedLinkTableID;
</span><ins>+ encoder << websiteDataStoreID;
</ins><span class="cx"> encoder << canRunBeforeUnloadConfirmPanel;
</span><span class="cx"> encoder << canRunModal;
</span><span class="cx"> encoder << deviceScaleFactor;
</span><span class="lines">@@ -122,6 +123,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.visitedLinkTableID))
</span><span class="cx"> return false;
</span><ins>+ if (!decoder.decode(parameters.websiteDataStoreID))
+ return false;
</ins><span class="cx"> if (!decoder.decode(parameters.canRunBeforeUnloadConfirmPanel))
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(parameters.canRunModal))
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (177019 => 177020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h        2014-12-09 17:11:18 UTC (rev 177019)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h        2014-12-09 17:16:12 UTC (rev 177020)
</span><span class="lines">@@ -87,6 +87,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t userContentControllerID;
</span><span class="cx"> uint64_t visitedLinkTableID;
</span><ins>+ uint64_t websiteDataStoreID;
</ins><span class="cx"> bool canRunBeforeUnloadConfirmPanel;
</span><span class="cx"> bool canRunModal;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (177019 => 177020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-12-09 17:11:18 UTC (rev 177019)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp        2014-12-09 17:16:12 UTC (rev 177020)
</span><span class="lines">@@ -4612,6 +4612,7 @@
</span><span class="cx"> parameters.highestUsedBackForwardItemID = WebBackForwardListItem::highedUsedItemID();
</span><span class="cx"> parameters.userContentControllerID = m_userContentController ? m_userContentController->identifier() : 0;
</span><span class="cx"> parameters.visitedLinkTableID = m_visitedLinkProvider->identifier();
</span><ins>+ parameters.websiteDataStoreID = m_websiteDataStore->identifier();
</ins><span class="cx"> parameters.canRunBeforeUnloadConfirmPanel = m_uiClient->canRunBeforeUnloadConfirmPanel();
</span><span class="cx"> parameters.canRunModal = m_canRunModal;
</span><span class="cx"> parameters.deviceScaleFactor = deviceScaleFactor();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (177019 => 177020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp        2014-12-09 17:11:18 UTC (rev 177019)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp        2014-12-09 17:16:12 UTC (rev 177020)
</span><span class="lines">@@ -38,6 +38,13 @@
</span><span class="cx"> return WebCore::SessionID(--sessionID);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static uint64_t generateIdentifier()
+{
+ static uint64_t identifier;
+
+ return ++identifier;
+}
+
</ins><span class="cx"> RefPtr<WebsiteDataStore> WebsiteDataStore::createNonPersistent()
</span><span class="cx"> {
</span><span class="cx"> return adoptRef(new WebsiteDataStore(generateNonPersistentSessionID()));
</span><span class="lines">@@ -49,12 +56,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebsiteDataStore::WebsiteDataStore(Configuration)
</span><del>- : m_sessionID(WebCore::SessionID::defaultSessionID())
</del><ins>+ : m_identifier(generateIdentifier())
+ , m_sessionID(WebCore::SessionID::defaultSessionID())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebsiteDataStore::WebsiteDataStore(WebCore::SessionID sessionID)
</span><del>- : m_sessionID(sessionID)
</del><ins>+ : m_identifier(generateIdentifier())
+ , m_sessionID(sessionID)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (177019 => 177020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h        2014-12-09 17:11:18 UTC (rev 177019)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h        2014-12-09 17:16:12 UTC (rev 177020)
</span><span class="lines">@@ -51,6 +51,8 @@
</span><span class="cx"> void addWebPage(WebPageProxy&);
</span><span class="cx"> void removeWebPage(WebPageProxy&);
</span><span class="cx">
</span><ins>+ uint64_t identifier() const { return m_identifier; }
+
</ins><span class="cx"> bool isNonPersistent() const { return m_sessionID.isEphemeral(); }
</span><span class="cx"> WebCore::SessionID sessionID() const { return m_sessionID; }
</span><span class="cx">
</span><span class="lines">@@ -61,6 +63,7 @@
</span><span class="cx"> explicit WebsiteDataStore(Configuration);
</span><span class="cx">
</span><span class="cx"> HashSet<WebPageProxy*> m_webPages;
</span><ins>+ uint64_t m_identifier;
</ins><span class="cx"> WebCore::SessionID m_sessionID;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>