<!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>[185457] 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/185457">185457</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-06-11 10:01:46 -0700 (Thu, 11 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rewrite WKPluginSiteDataManager using WebsiteDataStore functions
https://bugs.webkit.org/show_bug.cgi?id=145868
Reviewed by Antti Koivisto.
* UIProcess/API/C/WKPluginSiteDataManager.cpp:
(WKPluginSiteDataManagerGetSitesWithData):
(WKPluginSiteDataManagerClearSiteData):
(WKPluginSiteDataManagerClearAllSiteData):
(toNPClearSiteDataFlags): Deleted.
* UIProcess/Plugins/WebPluginSiteDataManager.h:
(WebKit::WebPluginSiteDataManager::processPool):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPluginSiteDataManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagerh">trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185456 => 185457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-06-11 16:00:40 UTC (rev 185456)
+++ trunk/Source/WebKit2/ChangeLog 2015-06-11 17:01:46 UTC (rev 185457)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-06-10 Anders Carlsson <andersca@apple.com>
+
+ Rewrite WKPluginSiteDataManager using WebsiteDataStore functions
+ https://bugs.webkit.org/show_bug.cgi?id=145868
+
+ Reviewed by Antti Koivisto.
+
+ * UIProcess/API/C/WKPluginSiteDataManager.cpp:
+ (WKPluginSiteDataManagerGetSitesWithData):
+ (WKPluginSiteDataManagerClearSiteData):
+ (WKPluginSiteDataManagerClearAllSiteData):
+ (toNPClearSiteDataFlags): Deleted.
+ * UIProcess/Plugins/WebPluginSiteDataManager.h:
+ (WebKit::WebPluginSiteDataManager::processPool):
+
</ins><span class="cx"> 2015-06-11 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> 3% cold PLT regression from network cache on iOS
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPluginSiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp (185456 => 185457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2015-06-11 16:00:40 UTC (rev 185456)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2015-06-11 17:01:46 UTC (rev 185457)
</span><span class="lines">@@ -29,14 +29,9 @@
</span><span class="cx"> #include "APIObject.h"
</span><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WebPluginSiteDataManager.h"
</span><ins>+#include "WebProcessPool.h"
+#include "WebsiteDataRecord.h"
</ins><span class="cx">
</span><del>-#if ENABLE(NETSCAPE_PLUGIN_API)
-#include <WebCore/npapi.h>
-#if defined(MOZ_X11)
-#undef None
-#endif
-#endif
-
</del><span class="cx"> using namespace WebKit;
</span><span class="cx">
</span><span class="cx"> WKTypeID WKPluginSiteDataManagerGetTypeID()
</span><span class="lines">@@ -48,55 +43,61 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPluginSiteDataManagerGetSitesWithData(WKPluginSiteDataManagerRef managerRef, void* context, WKPluginSiteDataManagerGetSitesWithDataFunction callback)
</del><ins>+void WKPluginSiteDataManagerGetSitesWithData(WKPluginSiteDataManagerRef manager, void* context, WKPluginSiteDataManagerGetSitesWithDataFunction callback)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- toImpl(managerRef)->getSitesWithData(toGenericCallbackFunction(context, callback));
</del><ins>+ auto& websiteDataStore = toImpl(manager)->processPool().websiteDataStore()->websiteDataStore();
+ websiteDataStore.fetchData(WebsiteDataTypes::WebsiteDataTypePlugInData, [context, callback](Vector<WebsiteDataRecord> dataRecords) {
+ Vector<String> hostNames;
+ for (const auto& dataRecord : dataRecords) {
+ for (const auto& hostName : dataRecord.pluginDataHostNames)
+ hostNames.append(hostName);
+ }
+
+ callback(toAPI(API::Array::createStringArray(hostNames).ptr()), nullptr, context);
+ });
</ins><span class="cx"> #else
</span><del>- UNUSED_PARAM(managerRef);
</del><ins>+ UNUSED_PARAM(manager);
</ins><span class="cx"> UNUSED_PARAM(context);
</span><span class="cx"> UNUSED_PARAM(callback);
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETSCAPE_PLUGIN_API)
-static uint64_t toNPClearSiteDataFlags(WKClearSiteDataFlags flags)
</del><ins>+void WKPluginSiteDataManagerClearSiteData(WKPluginSiteDataManagerRef manager, WKArrayRef sites, WKClearSiteDataFlags flags, uint64_t maxAgeInSeconds, void* context, WKPluginSiteDataManagerClearSiteDataFunction callback)
</ins><span class="cx"> {
</span><del>- if (flags == kWKClearSiteDataFlagsClearAll)
- return NP_CLEAR_ALL;
</del><ins>+ // These are the only parameters supported.
+ ASSERT_UNUSED(flags, flags == kWKClearSiteDataFlagsClearAll);
+ ASSERT_UNUSED(maxAgeInSeconds, maxAgeInSeconds == std::numeric_limits<uint64_t>::max());
</ins><span class="cx">
</span><del>- uint64_t result = 0;
- if (flags & kWKClearSiteDataFlagsClearCache)
- result |= NP_CLEAR_CACHE;
- return result;
-}
-#endif
</del><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
+ WebsiteDataRecord dataRecord;
+ for (const auto& string : toImpl(sites)->elementsOfType<API::String>())
+ dataRecord.pluginDataHostNames.add(string->string());
</ins><span class="cx">
</span><del>-void WKPluginSiteDataManagerClearSiteData(WKPluginSiteDataManagerRef managerRef, WKArrayRef sitesRef, WKClearSiteDataFlags flags, uint64_t maxAgeInSeconds, void* context, WKPluginSiteDataManagerClearSiteDataFunction function)
-{
-#if ENABLE(NETSCAPE_PLUGIN_API)
- toImpl(managerRef)->clearSiteData(toImpl(sitesRef), toNPClearSiteDataFlags(flags), maxAgeInSeconds, [context, function](CallbackBase::Error error) {
- function(error == CallbackBase::Error::None ? nullptr : toAPI(API::Error::create().ptr()), context);
</del><ins>+ auto& websiteDataStore = toImpl(manager)->processPool().websiteDataStore()->websiteDataStore();
+ websiteDataStore.removeData(WebsiteDataTypes::WebsiteDataTypePlugInData, { dataRecord }, [context, callback] {
+ callback(nullptr, context);
</ins><span class="cx"> });
</span><span class="cx"> #else
</span><del>- UNUSED_PARAM(managerRef);
- UNUSED_PARAM(sitesRef);
</del><ins>+ UNUSED_PARAM(manager);
+ UNUSED_PARAM(sites);
</ins><span class="cx"> UNUSED_PARAM(flags);
</span><span class="cx"> UNUSED_PARAM(maxAgeInSeconds);
</span><span class="cx"> UNUSED_PARAM(context);
</span><del>- UNUSED_PARAM(function);
</del><ins>+ UNUSED_PARAM(callback);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPluginSiteDataManagerClearAllSiteData(WKPluginSiteDataManagerRef managerRef, void* context, WKPluginSiteDataManagerClearSiteDataFunction function)
</del><ins>+void WKPluginSiteDataManagerClearAllSiteData(WKPluginSiteDataManagerRef manager, void* context, WKPluginSiteDataManagerClearSiteDataFunction callback)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- toImpl(managerRef)->clearSiteData(0, NP_CLEAR_ALL, std::numeric_limits<uint64_t>::max(), [context, function](CallbackBase::Error error) {
- function(error == CallbackBase::Error::None ? nullptr : toAPI(API::Error::create().ptr()), context);
</del><ins>+ auto& websiteDataStore = toImpl(manager)->processPool().websiteDataStore()->websiteDataStore();
+ websiteDataStore.removeData(WebsiteDataTypes::WebsiteDataTypePlugInData, std::chrono::system_clock::time_point::min(), [context, callback] {
+ callback(nullptr, context);
</ins><span class="cx"> });
</span><span class="cx"> #else
</span><del>- UNUSED_PARAM(managerRef);
</del><ins>+ UNUSED_PARAM(manager);
</ins><span class="cx"> UNUSED_PARAM(context);
</span><del>- UNUSED_PARAM(function);
</del><ins>+ UNUSED_PARAM(callback);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPluginsWebPluginSiteDataManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h (185456 => 185457)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h 2015-06-11 16:00:40 UTC (rev 185456)
+++ trunk/Source/WebKit2/UIProcess/Plugins/WebPluginSiteDataManager.h 2015-06-11 17:01:46 UTC (rev 185457)
</span><span class="lines">@@ -47,6 +47,8 @@
</span><span class="cx"> static PassRefPtr<WebPluginSiteDataManager> create(WebProcessPool*);
</span><span class="cx"> virtual ~WebPluginSiteDataManager();
</span><span class="cx">
</span><ins>+ WebProcessPool& processPool() { return *m_processPool; }
+
</ins><span class="cx"> void invalidate();
</span><span class="cx"> void clearProcessPool() { m_processPool = nullptr; }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>