<!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>[185383] 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/185383">185383</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-09 14:33:21 -0700 (Tue, 09 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add Plug-in type declarations to WKWebsiteDataRecord and friends
https://bugs.webkit.org/show_bug.cgi?id=145816
Reviewed by Andreas Kling.
* Shared/WebsiteData/WebsiteDataTypes.h:
* UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
(dataTypesToString):
* UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
(WebKit::toWebsiteDataTypes):
(WebKit::toWKWebsiteDataTypes):
* UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185382 => 185383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-09 21:25:40 UTC (rev 185382)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-09 21:33:21 UTC (rev 185383)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-09 Anders Carlsson <andersca@apple.com>
+
+ Add Plug-in type declarations to WKWebsiteDataRecord and friends
+ https://bugs.webkit.org/show_bug.cgi?id=145816
+
+ Reviewed by Andreas Kling.
+
+ * Shared/WebsiteData/WebsiteDataTypes.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
+ (dataTypesToString):
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
+ (WebKit::toWebsiteDataTypes):
+ (WebKit::toWKWebsiteDataTypes):
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h:
+
</ins><span class="cx"> 2015-06-09 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r185262): NetworkCache is in wrong location on OS X
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h (185382 => 185383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-06-09 21:25:40 UTC (rev 185382)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-06-09 21:33:21 UTC (rev 185383)
</span><span class="lines">@@ -38,6 +38,9 @@
</span><span class="cx"> WebsiteDataTypeWebSQLDatabases = 1 << 6,
</span><span class="cx"> WebsiteDataTypeIndexedDBDatabases = 1 << 7,
</span><span class="cx"> WebsiteDataTypeMediaKeys = 1 << 8,
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+ WebsiteDataTypePlugInData = 1 << 9,
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm (185382 => 185383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2015-06-09 21:25:40 UTC (rev 185382)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2015-06-09 21:33:21 UTC (rev 185383)
</span><span class="lines">@@ -41,6 +41,10 @@
</span><span class="cx">
</span><span class="cx"> NSString * const _WKWebsiteDataTypeMediaKeys = @"_WKWebsiteDataTypeMediaKeys";
</span><span class="cx">
</span><ins>+#if PLATFORM(MAC)
+NSString * const _WKWebsiteDataTypePlugInData = @"_WKWebsiteDataTypePlugInData";
+#endif
+
</ins><span class="cx"> @implementation WKWebsiteDataRecord
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="lines">@@ -72,6 +76,10 @@
</span><span class="cx"> [array addObject:@"IndexedDB"];
</span><span class="cx"> if ([dataTypes containsObject:_WKWebsiteDataTypeMediaKeys])
</span><span class="cx"> [array addObject:@"Media Keys"];
</span><ins>+#if PLATFORM(MAC)
+ if ([dataTypes containsObject:_WKWebsiteDataTypePlugInData])
+ [array addObject:@"Plug-in Data"];
+#endif
</ins><span class="cx">
</span><span class="cx"> return [array componentsJoinedByString:@", "];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h (185382 => 185383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2015-06-09 21:25:40 UTC (rev 185382)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2015-06-09 21:33:21 UTC (rev 185383)
</span><span class="lines">@@ -62,7 +62,10 @@
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases;
</span><span class="cx"> if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypeMediaKeys])
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMediaKeys;
</span><del>-
</del><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+ if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypePlugInData])
+ websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypePlugInData;
+#endif
</ins><span class="cx"> return static_cast<WebsiteDataTypes>(websiteDataTypes);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -90,6 +93,10 @@
</span><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeIndexedDBDatabases];
</span><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeMediaKeys)
</span><span class="cx"> [wkWebsiteDataTypes addObject:_WKWebsiteDataTypeMediaKeys];
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+ if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypePlugInData)
+ [wkWebsiteDataTypes addObject:_WKWebsiteDataTypePlugInData];
+#endif
</ins><span class="cx">
</span><span class="cx"> return wkWebsiteDataTypes;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h (185382 => 185383)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2015-06-09 21:25:40 UTC (rev 185382)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2015-06-09 21:33:21 UTC (rev 185383)
</span><span class="lines">@@ -29,4 +29,8 @@
</span><span class="cx">
</span><span class="cx"> WK_EXTERN NSString * const _WKWebsiteDataTypeMediaKeys WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span><ins>+#if !TARGET_OS_IPHONE
+WK_EXTERN NSString * const _WKWebsiteDataTypePlugInData WK_AVAILABLE(WK_MAC_TBA, NA);
</ins><span class="cx"> #endif
</span><ins>+
+#endif
</ins></span></pre>
</div>
</div>
</body>
</html>