<!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>[185529] 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/185529">185529</a></dd>

<dt>Author</dt> <dd>andersca@apple.com</dd>

<dt>Date</dt> <dd>2015-06-12 18:40:57 -0700 (Fri, 12 Jun 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Reimplement WKResourceCacheManagerRef on top of WKWebsiteDataStoreRef

https://bugs.webkit.org/show_bug.cgi?id=145951

Reviewed by Darin Adler.

* UIProcess/API/C/WKContext.cpp:

(WKContextGetResourceCacheManager):

* UIProcess/API/C/WKResourceCacheManager.cpp:

(WKResourceCacheManagerGetTypeID):

(toWebsiteDataTypes):

(WKResourceCacheManagerGetCacheOrigins):

(WKResourceCacheManagerClearCacheForOrigin):

(WKResourceCacheManagerClearCacheForAllOrigins):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2SharedSecurityOriginDatah">trunk/Source/WebKit2/Shared/SecurityOriginData.h</a></li>

<li><a href="#trunkSourceWebKit2UIProcessAPICWKContextcpp">trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessAPICWKResourceCacheManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (185528 => 185529)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-06-13 01:35:08 UTC (rev 185528)

+++ trunk/Source/WebKit2/ChangeLog        2015-06-13 01:40:57 UTC (rev 185529)

</span><span class="lines">@@ -1,5 +1,21 @@

</span><span class="cx"> 2015-06-12  Anders Carlsson  &lt;andersca@apple.com&gt;

</span><span class="cx"> 

</span><ins>+        Reimplement WKResourceCacheManagerRef on top of WKWebsiteDataStoreRef

+        https://bugs.webkit.org/show_bug.cgi?id=145951

+

+        Reviewed by Darin Adler.

+

+        * UIProcess/API/C/WKContext.cpp:

+        (WKContextGetResourceCacheManager):

+        * UIProcess/API/C/WKResourceCacheManager.cpp:

+        (WKResourceCacheManagerGetTypeID):

+        (toWebsiteDataTypes):

+        (WKResourceCacheManagerGetCacheOrigins):

+        (WKResourceCacheManagerClearCacheForOrigin):

+        (WKResourceCacheManagerClearCacheForAllOrigins):

+

+2015-06-12  Anders Carlsson  &lt;andersca@apple.com&gt;

+

</ins><span class="cx">         Reimplement WKApplicationCacheManagerRef as WKWebsiteDataStoreRef

</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=145950

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebKit2SharedSecurityOriginDatah"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/SecurityOriginData.h (185528 => 185529)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/Shared/SecurityOriginData.h        2015-06-13 01:35:08 UTC (rev 185528)

+++ trunk/Source/WebKit2/Shared/SecurityOriginData.h        2015-06-13 01:40:57 UTC (rev 185529)

</span><span class="lines">@@ -1,4 +1,4 @@

</span><del>-/*

</del><ins>+ /*

</span><span class="cx">  *

</span><span class="cx">  * Redistribution and use in source and binary forms, with or without

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessAPICWKContextcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp (185528 => 185529)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp        2015-06-13 01:35:08 UTC (rev 185528)

+++ trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp        2015-06-13 01:40:57 UTC (rev 185529)

</span><span class="lines">@@ -472,9 +472,9 @@

</span><span class="cx"> #endif

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef contextRef)

</del><ins>+WKResourceCacheManagerRef WKContextGetResourceCacheManager(WKContextRef context)

</ins><span class="cx"> {

</span><del>-    return toAPI(toImpl(contextRef)-&gt;supplement&lt;WebResourceCacheManagerProxy&gt;());

</del><ins>+    return reinterpret_cast&lt;WKResourceCacheManagerRef&gt;(WKContextGetWebsiteDataStore(context));

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> WKOriginDataManagerRef WKContextGetOriginDataManager(WKContextRef context)

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessAPICWKResourceCacheManagercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp (185528 => 185529)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp        2015-06-13 01:35:08 UTC (rev 185528)

+++ trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp        2015-06-13 01:40:57 UTC (rev 185529)

</span><span class="lines">@@ -26,27 +26,68 @@

</span><span class="cx"> #include &quot;config.h&quot;

</span><span class="cx"> #include &quot;WKResourceCacheManager.h&quot;

</span><span class="cx"> 

</span><del>-#include &quot;WebResourceCacheManagerProxy.h&quot;

</del><ins>+#include &quot;APIWebsiteDataStore.h&quot;

</ins><span class="cx"> #include &quot;WKAPICast.h&quot;

</span><ins>+#include &quot;WebsiteDataRecord.h&quot;

</ins><span class="cx"> 

</span><span class="cx"> using namespace WebKit;

</span><span class="cx"> 

</span><span class="cx"> WKTypeID WKResourceCacheManagerGetTypeID()

</span><span class="cx"> {

</span><del>-    return toAPI(WebResourceCacheManagerProxy::APIType);

</del><ins>+    return toAPI(API::WebsiteDataStore::APIType);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><del>-void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef cacheManagerRef, void* context, WKResourceCacheManagerGetCacheOriginsFunction callback)

</del><ins>+static WebsiteDataTypes toWebsiteDataTypes(WKResourceCachesToClear cachesToClear)

</ins><span class="cx"> {

</span><del>-    toImpl(cacheManagerRef)-&gt;getCacheOrigins(toGenericCallbackFunction(context, callback));

</del><ins>+    using WebsiteDataTypes = WebKit::WebsiteDataTypes;

+

+    int websiteDataTypes = WebsiteDataTypeMemoryCache;

+

+    if (cachesToClear == WKResourceCachesToClearAll)

+        websiteDataTypes |= WebsiteDataTypeDiskCache;

+

+    return static_cast&lt;WebsiteDataTypes&gt;(websiteDataTypes);

</ins><span class="cx"> }

</span><span class="cx"> 

</span><del>-void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManagerRef, WKSecurityOriginRef originRef, WKResourceCachesToClear cachesToClear)

</del><ins>+void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef cacheManager, void* context, WKResourceCacheManagerGetCacheOriginsFunction callback)

</ins><span class="cx"> {

</span><del>-    toImpl(cacheManagerRef)-&gt;clearCacheForOrigin(toImpl(originRef), toResourceCachesToClear(cachesToClear));

</del><ins>+    auto&amp; websiteDataStore = toImpl(reinterpret_cast&lt;WKWebsiteDataStoreRef&gt;(cacheManager))-&gt;websiteDataStore();

+    websiteDataStore.fetchData(toWebsiteDataTypes(WKResourceCachesToClearAll), [context, callback](Vector&lt;WebsiteDataRecord&gt; dataRecords) {

+        Vector&lt;RefPtr&lt;API::Object&gt;&gt; securityOrigins;

+        for (const auto&amp; dataRecord : dataRecords) {

+            for (const auto&amp; origin : dataRecord.origins)

+                securityOrigins.append(API::SecurityOrigin::create(origin));

+        }

+

+        callback(toAPI(API::Array::create(WTF::move(securityOrigins)).ptr()), nullptr, context);

+    });

</ins><span class="cx"> }

</span><span class="cx"> 

</span><del>-void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManagerRef, WKResourceCachesToClear cachesToClear)

</del><ins>+void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManager, WKSecurityOriginRef origin, WKResourceCachesToClear cachesToClear)

</ins><span class="cx"> {

</span><del>-    toImpl(cacheManagerRef)-&gt;clearCacheForAllOrigins(toResourceCachesToClear(cachesToClear));

</del><ins>+    auto&amp; websiteDataStore = toImpl(reinterpret_cast&lt;WKWebsiteDataStoreRef&gt;(cacheManager))-&gt;websiteDataStore();

+

+    Vector&lt;WebsiteDataRecord&gt; dataRecords;

+

+    {

+        WebsiteDataRecord dataRecord;

+        dataRecord.add(WebsiteDataTypes::WebsiteDataTypeMemoryCache, &amp;toImpl(origin)-&gt;securityOrigin());

+

+        dataRecords.append(dataRecord);

+    }

+

+    if (cachesToClear == WKResourceCachesToClearAll) {

+        WebsiteDataRecord dataRecord;

+        dataRecord.add(WebsiteDataTypes::WebsiteDataTypeDiskCache, &amp;toImpl(origin)-&gt;securityOrigin());

+

+        dataRecords.append(dataRecord);

+    }

+

+    websiteDataStore.removeData(toWebsiteDataTypes(cachesToClear), dataRecords, [] { });

</ins><span class="cx"> }

</span><ins>+

+void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManager, WKResourceCachesToClear cachesToClear)

+{

+    auto&amp; websiteDataStore = toImpl(reinterpret_cast&lt;WKWebsiteDataStoreRef&gt;(cacheManager))-&gt;websiteDataStore();

+    websiteDataStore.removeData(toWebsiteDataTypes(cachesToClear), std::chrono::system_clock::time_point::min(), [] { });

+}

</ins></span></pre>

</div>

</div>

</body>

</html>