<!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>[185386] 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/185386">185386</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-09 15:12:41 -0700 (Tue, 09 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add code to keep track of plug-in data host names in website data records
https://bugs.webkit.org/show_bug.cgi?id=145818
Reviewed by Andreas Kling.
* Shared/WebsiteData/WebsiteData.cpp:
(WebKit::WebsiteData::encode):
(WebKit::WebsiteData::decode):
* Shared/WebsiteData/WebsiteData.h:
* UIProcess/WebsiteData/WebsiteDataRecord.cpp:
(WebKit::WebsiteDataRecord::displayNameForPluginDataHostName):
(WebKit::WebsiteDataRecord::addPluginDataHostName):
(WebKit::WebsiteDataRecord::displayNameForCookieHostName): Deleted.
* UIProcess/WebsiteData/WebsiteDataRecord.h:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::WebsiteDataStore::fetchData):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDatacpp">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDatah">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataRecordcpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataRecordh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185385 => 185386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-09 22:01:50 UTC (rev 185385)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-09 22:12:41 UTC (rev 185386)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-06-09 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Add code to keep track of plug-in data host names in website data records
+ https://bugs.webkit.org/show_bug.cgi?id=145818
+
+ Reviewed by Andreas Kling.
+
+ * Shared/WebsiteData/WebsiteData.cpp:
+ (WebKit::WebsiteData::encode):
+ (WebKit::WebsiteData::decode):
+ * Shared/WebsiteData/WebsiteData.h:
+ * UIProcess/WebsiteData/WebsiteDataRecord.cpp:
+ (WebKit::WebsiteDataRecord::displayNameForPluginDataHostName):
+ (WebKit::WebsiteDataRecord::addPluginDataHostName):
+ (WebKit::WebsiteDataRecord::displayNameForCookieHostName): Deleted.
+ * UIProcess/WebsiteData/WebsiteDataRecord.h:
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::WebsiteDataStore::fetchData):
+
+2015-06-09 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Add Plug-in type declarations to WKWebsiteDataRecord and friends
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=145816
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDatacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp (185385 => 185386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp 2015-06-09 22:01:50 UTC (rev 185385)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.cpp 2015-06-09 22:12:41 UTC (rev 185386)
</span><span class="lines">@@ -54,6 +54,9 @@
</span><span class="cx"> {
</span><span class="cx"> encoder << entries;
</span><span class="cx"> encoder << hostNamesWithCookies;
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+ encoder << hostNamesWithPluginData;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool WebsiteData::decode(IPC::ArgumentDecoder& decoder, WebsiteData& result)
</span><span class="lines">@@ -62,6 +65,10 @@
</span><span class="cx"> return false;
</span><span class="cx"> if (!decoder.decode(result.hostNamesWithCookies))
</span><span class="cx"> return false;
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+ if (!decoder.decode(result.hostNamesWithPluginData))
+ return false;
+#endif
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h (185385 => 185386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h 2015-06-09 22:01:50 UTC (rev 185385)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h 2015-06-09 22:12:41 UTC (rev 185386)
</span><span class="lines">@@ -50,6 +50,10 @@
</span><span class="cx"> Vector<Entry> entries;
</span><span class="cx"> HashSet<String> hostNamesWithCookies;
</span><span class="cx">
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+ HashSet<String> hostNamesWithPluginData;
+#endif
+
</ins><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, WebsiteData&);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataRecordcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp (185385 => 185386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp 2015-06-09 22:01:50 UTC (rev 185385)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp 2015-06-09 22:12:41 UTC (rev 185386)
</span><span class="lines">@@ -48,8 +48,6 @@
</span><span class="cx"> return displayNameForLocalFiles();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // FIXME: This needs to handle the local file domain for cookies.
-
</del><span class="cx"> #if ENABLE(PUBLIC_SUFFIX_LIST)
</span><span class="cx"> return WebCore::topPrivatelyControlledDomain(hostName.startsWith('.') ? hostName.substring(1) : hostName);
</span><span class="cx"> #endif
</span><span class="lines">@@ -57,6 +55,17 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+String WebsiteDataRecord::displayNameForPluginDataHostName(const String& hostName)
+{
+#if ENABLE(PUBLIC_SUFFIX_LIST)
+ return WebCore::topPrivatelyControlledDomain(hostName);
+#endif
+
+ return String();
+}
+#endif
+
</ins><span class="cx"> String WebsiteDataRecord::displayNameForOrigin(const WebCore::SecurityOrigin& securityOrigin)
</span><span class="cx"> {
</span><span class="cx"> const auto& protocol = securityOrigin.protocol();
</span><span class="lines">@@ -86,4 +95,13 @@
</span><span class="cx"> cookieHostNames.add(hostName);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+void WebsiteDataRecord::addPluginDataHostName(const String& hostName)
+{
+ types |= WebsiteDataTypePlugInData;
+
+ pluginDataHostNames.add(hostName);
</ins><span class="cx"> }
</span><ins>+#endif
+
+}
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataRecordh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h (185385 => 185386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h 2015-06-09 22:01:50 UTC (rev 185385)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h 2015-06-09 22:12:41 UTC (rev 185386)
</span><span class="lines">@@ -40,15 +40,24 @@
</span><span class="cx">
</span><span class="cx"> struct WebsiteDataRecord {
</span><span class="cx"> static String displayNameForCookieHostName(const String& hostName);
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+ static String displayNameForPluginDataHostName(const String& hostName);
+#endif
</ins><span class="cx"> static String displayNameForOrigin(const WebCore::SecurityOrigin&);
</span><span class="cx">
</span><span class="cx"> void add(WebsiteDataTypes, RefPtr<WebCore::SecurityOrigin>&&);
</span><span class="cx"> void addCookieHostName(const String& hostName);
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+ void addPluginDataHostName(const String& hostName);
+#endif
</ins><span class="cx">
</span><span class="cx"> String displayName;
</span><span class="cx"> unsigned types { 0 };
</span><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx"> HashSet<String> cookieHostNames;
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+ HashSet<String> pluginDataHostNames;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (185385 => 185386)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-06-09 22:01:50 UTC (rev 185385)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-06-09 22:12:41 UTC (rev 185386)
</span><span class="lines">@@ -187,6 +187,20 @@
</span><span class="cx"> record.addCookieHostName(hostName);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+ for (auto& hostName : websiteData.hostNamesWithPluginData) {
+ auto displayName = WebsiteDataRecord::displayNameForPluginDataHostName(hostName);
+ if (!displayName)
+ continue;
+
+ auto& record = m_websiteDataRecords.add(displayName, WebsiteDataRecord { }).iterator->value;
+ if (!record.displayName)
+ record.displayName = WTF::move(displayName);
+
+ record.addPluginDataHostName(hostName);
+ }
+#endif
+
</ins><span class="cx"> callIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>