<!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>[176963] trunk/Source</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/176963">176963</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-12-08 12:36:27 -0800 (Mon, 08 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make deleting all cookies after a given date a little more sane
https://bugs.webkit.org/show_bug.cgi?id=139409
Reviewed by Antti Koivisto.
Source/WebCore:
* WebCore.exp.in:
Update exports.
* platform/network/PlatformCookieJar.h:
* platform/network/cf/CookieJarCFNet.cpp:
* platform/network/curl/CookieJarCurl.cpp:
* platform/network/soup/CookieJarSoup.cpp:
Rename deleteAllCookiesModifiedAfterDate to deleteAllCookiesModifiedSince and change it
to take an std::chrono::system_clock::time_point instead.
* platform/network/mac/CookieJarMac.mm:
(WebCore::cookieStorage):
Helper function that returns an NSHTTPCookieStorage given a network session.
(WebCore::deleteAllCookiesModifiedSince):
Get the cookie storage from the network storage instead of just getting the global one.
Source/WebKit2:
Change all the doubles to std::chrono::system_clock::time_points instead.
* Platform/IPC/ArgumentCoders.cpp:
(IPC::ArgumentCoder<std::chrono::system_clock::time_point>::encode):
(IPC::ArgumentCoder<std::chrono::system_clock::time_point>::decode):
* Platform/IPC/ArgumentCoders.h:
* Scripts/webkit/messages.py:
(headers_for_type):
* UIProcess/API/C/WKCookieManager.cpp:
(WKCookieManagerDeleteAllCookiesModifiedAfterDate):
* UIProcess/API/C/WKCookieManager.h:
* UIProcess/WebCookieManagerProxy.cpp:
(WebKit::WebCookieManagerProxy::deleteAllCookiesModifiedSince):
(WebKit::WebCookieManagerProxy::deleteAllCookiesModifiedAfterDate): Deleted.
* UIProcess/WebCookieManagerProxy.h:
* WebProcess/Cookies/WebCookieManager.cpp:
(WebKit::WebCookieManager::deleteAllCookiesModifiedSince):
(WebKit::WebCookieManager::deleteAllCookiesModifiedAfterDate): Deleted.
* WebProcess/Cookies/WebCookieManager.h:
* WebProcess/Cookies/WebCookieManager.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCoreexpin">trunk/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkPlatformCookieJarh">trunk/Source/WebCore/platform/network/PlatformCookieJar.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfCookieJarCFNetcpp">trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcurlCookieJarCurlcpp">trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacCookieJarMacmm">trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupCookieJarSoupcpp">trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentCoderscpp">trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentCodersh">trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkitmessagespy">trunk/Source/WebKit2/Scripts/webkit/messages.py</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKCookieManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKCookieManagerh">trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebCookieManagerProxyh">trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessCookiesWebCookieManagercpp">trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessCookiesWebCookieManagerh">trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessCookiesWebCookieManagermessagesin">trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebCore/ChangeLog 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-12-08 Anders Carlsson <andersca@apple.com>
+
+ Make deleting all cookies after a given date a little more sane
+ https://bugs.webkit.org/show_bug.cgi?id=139409
+
+ Reviewed by Antti Koivisto.
+
+ * WebCore.exp.in:
+ Update exports.
+
+ * platform/network/PlatformCookieJar.h:
+ * platform/network/cf/CookieJarCFNet.cpp:
+ * platform/network/curl/CookieJarCurl.cpp:
+ * platform/network/soup/CookieJarSoup.cpp:
+ Rename deleteAllCookiesModifiedAfterDate to deleteAllCookiesModifiedSince and change it
+ to take an std::chrono::system_clock::time_point instead.
+
+ * platform/network/mac/CookieJarMac.mm:
+ (WebCore::cookieStorage):
+ Helper function that returns an NSHTTPCookieStorage given a network session.
+
+ (WebCore::deleteAllCookiesModifiedSince):
+ Get the cookie storage from the network storage instead of just getting the global one.
+
</ins><span class="cx"> 2014-12-08 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> URTBF after r176953, add an unreachable return to make GCC happy.
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.exp.in (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.exp.in 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -1092,6 +1092,7 @@
</span><span class="cx"> __ZN7WebCore28throwArgumentMustBeEnumErrorERN3JSC9ExecStateEjPKcS4_S4_S4_
</span><span class="cx"> __ZN7WebCore29cookieRequestHeaderFieldValueERKNS_21NetworkStorageSessionERKNS_3URLES5_
</span><span class="cx"> __ZN7WebCore29createDefaultParagraphElementERNS_8DocumentE
</span><ins>+__ZN7WebCore29deleteAllCookiesModifiedSinceERKNS_21NetworkStorageSessionENSt3__16chrono10time_pointINS4_12system_clockENS4_8durationIxNS3_5ratioILl1ELl1000000EEEEEEE
</ins><span class="cx"> __ZN7WebCore29isCharacterSmartReplaceExemptEib
</span><span class="cx"> __ZN7WebCore30enclosingTextUnitOfGranularityERKNS_15VisiblePositionENS_15TextGranularityENS_18SelectionDirectionE
</span><span class="cx"> __ZN7WebCore30hostNameNeedsDecodingWithRangeEP8NSString8_NSRange
</span><span class="lines">@@ -1100,7 +1101,6 @@
</span><span class="cx"> __ZN7WebCore31CrossOriginPreflightResultCache5emptyEv
</span><span class="cx"> __ZN7WebCore31CrossOriginPreflightResultCache6sharedEv
</span><span class="cx"> __ZN7WebCore31equalIgnoringFragmentIdentifierERKNS_3URLES2_
</span><del>-__ZN7WebCore33deleteAllCookiesModifiedAfterDateERKNS_21NetworkStorageSessionEd
</del><span class="cx"> __ZN7WebCore33stripLeadingAndTrailingHTMLSpacesERKN3WTF6StringE
</span><span class="cx"> __ZN7WebCore36largestRectWithAspectRatioInsideRectEfRKNS_9FloatRectE
</span><span class="cx"> __ZN7WebCore36standardUserAgentWithApplicationNameERKN3WTF6StringES3_
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkPlatformCookieJarh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/PlatformCookieJar.h (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/PlatformCookieJar.h 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebCore/platform/network/PlatformCookieJar.h 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #ifndef PlatformCookieJar_h
</span><span class="cx"> #define PlatformCookieJar_h
</span><span class="cx">
</span><ins>+#include <chrono>
</ins><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -48,7 +49,7 @@
</span><span class="cx"> WEBCORE_EXPORT void getHostnamesWithCookies(const NetworkStorageSession&, HashSet<String>& hostnames);
</span><span class="cx"> WEBCORE_EXPORT void deleteCookiesForHostname(const NetworkStorageSession&, const String& hostname);
</span><span class="cx"> WEBCORE_EXPORT void deleteAllCookies(const NetworkStorageSession&);
</span><del>-WEBCORE_EXPORT void deleteAllCookiesModifiedAfterDate(const NetworkStorageSession&, double date);
</del><ins>+WEBCORE_EXPORT void deleteAllCookiesModifiedSince(const NetworkStorageSession&, std::chrono::system_clock::time_point);
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfCookieJarCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebCore/platform/network/cf/CookieJarCFNet.cpp 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> CFHTTPCookieStorageDeleteAllCookies(session.cookieStorage().get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void deleteAllCookiesModifiedAfterDate(const NetworkStorageSession&, double)
</del><ins>+void deleteAllCookiesModifiedSince(const NetworkStorageSession&, std::chrono::system_clock::time_point)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcurlCookieJarCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebCore/platform/network/curl/CookieJarCurl.cpp 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -340,7 +340,7 @@
</span><span class="cx"> // FIXME: Not yet implemented
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void deleteAllCookiesModifiedAfterDate(const NetworkStorageSession&, double)
</del><ins>+void deleteAllCookiesModifiedSince(const NetworkStorageSession&, std::chrono::system_clock::time_point)
</ins><span class="cx"> {
</span><span class="cx"> // FIXME: Not yet implemented
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacCookieJarMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebCore/platform/network/mac/CookieJarMac.mm 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -42,6 +42,8 @@
</span><span class="cx">
</span><span class="cx"> @interface NSHTTPCookieStorage (Details)
</span><span class="cx"> - (void)removeCookiesSinceDate:(NSDate *)date;
</span><ins>+- (id)_initWithCFHTTPCookieStorage:(CFHTTPCookieStorageRef)cfStorage;
+- (CFHTTPCookieStorageRef)_cookieStorage;
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -215,15 +217,26 @@
</span><span class="cx"> wkDeleteAllHTTPCookies(session.cookieStorage().get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void deleteAllCookiesModifiedAfterDate(const NetworkStorageSession& session, double date)
</del><ins>+static NSHTTPCookieStorage *cookieStorage(const NetworkStorageSession& session)
</ins><span class="cx"> {
</span><del>- UNUSED_PARAM(session);
</del><ins>+ auto cookieStorage = session.cookieStorage();
+ if (!cookieStorage || [NSHTTPCookieStorage sharedHTTPCookieStorage]._cookieStorage == cookieStorage)
+ return [NSHTTPCookieStorage sharedHTTPCookieStorage];
</ins><span class="cx">
</span><del>- NSHTTPCookieStorage *cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage];
- if ([cookieStorage respondsToSelector:@selector(removeCookiesSinceDate:)])
- [cookieStorage removeCookiesSinceDate:[NSDate dateWithTimeIntervalSince1970:date]];
</del><ins>+ return [[[NSHTTPCookieStorage alloc] _initWithCFHTTPCookieStorage:cookieStorage.get()] autorelease];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void deleteAllCookiesModifiedSince(const NetworkStorageSession& session, std::chrono::system_clock::time_point timePoint)
+{
+ if (![NSHTTPCookieStorage instancesRespondToSelector:@selector(removeCookiesSinceDate:)])
+ return;
+
+ NSTimeInterval timeInterval = std::chrono::duration_cast<std::chrono::duration<double>>(timePoint.time_since_epoch()).count();
+ NSDate *date = [NSDate dateWithTimeIntervalSince1970:timeInterval];
+
+ [cookieStorage(session) removeCookiesSinceDate:date];
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+}
+
</ins><span class="cx"> #endif // !USE(CFNETWORK)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupCookieJarSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebCore/platform/network/soup/CookieJarSoup.cpp 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void deleteAllCookiesModifiedAfterDate(const NetworkStorageSession&, double)
</del><ins>+void deleteAllCookiesModifiedSince(const NetworkStorageSession&, std::chrono::system_clock::time_point);
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2014-12-08 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Make deleting all cookies after a given date a little more sane
+ https://bugs.webkit.org/show_bug.cgi?id=139409
+
+ Reviewed by Antti Koivisto.
+
+ Change all the doubles to std::chrono::system_clock::time_points instead.
+
+ * Platform/IPC/ArgumentCoders.cpp:
+ (IPC::ArgumentCoder<std::chrono::system_clock::time_point>::encode):
+ (IPC::ArgumentCoder<std::chrono::system_clock::time_point>::decode):
+ * Platform/IPC/ArgumentCoders.h:
+ * Scripts/webkit/messages.py:
+ (headers_for_type):
+ * UIProcess/API/C/WKCookieManager.cpp:
+ (WKCookieManagerDeleteAllCookiesModifiedAfterDate):
+ * UIProcess/API/C/WKCookieManager.h:
+ * UIProcess/WebCookieManagerProxy.cpp:
+ (WebKit::WebCookieManagerProxy::deleteAllCookiesModifiedSince):
+ (WebKit::WebCookieManagerProxy::deleteAllCookiesModifiedAfterDate): Deleted.
+ * UIProcess/WebCookieManagerProxy.h:
+ * WebProcess/Cookies/WebCookieManager.cpp:
+ (WebKit::WebCookieManager::deleteAllCookiesModifiedSince):
+ (WebKit::WebCookieManager::deleteAllCookiesModifiedAfterDate): Deleted.
+ * WebProcess/Cookies/WebCookieManager.h:
+ * WebProcess/Cookies/WebCookieManager.messages.in:
+
+2014-12-08 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Move the callback invocation outside of the loop.
</span><span class="cx">
</span><span class="cx"> Rubber-stamped by Tim Horton.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentCoderscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.cpp 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -32,6 +32,21 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><ins>+void ArgumentCoder<std::chrono::system_clock::time_point>::encode(IPC::ArgumentEncoder& encoder, const std::chrono::system_clock::time_point& timePoint)
+{
+ encoder << static_cast<int64_t>(timePoint.time_since_epoch().count());
+}
+
+bool ArgumentCoder<std::chrono::system_clock::time_point>::decode(ArgumentDecoder& decoder, std::chrono::system_clock::time_point& result)
+{
+ int64_t time;
+ if (!decoder.decode(time))
+ return false;
+
+ result = std::chrono::system_clock::time_point(std::chrono::system_clock::duration(static_cast<std::chrono::system_clock::rep>(time)));
+ return true;
+}
+
</ins><span class="cx"> void ArgumentCoder<AtomicString>::encode(ArgumentEncoder& encoder, const AtomicString& atomicString)
</span><span class="cx"> {
</span><span class="cx"> encoder << atomicString.string();
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -278,6 +278,11 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<> struct ArgumentCoder<std::chrono::system_clock::time_point> {
+ static void encode(ArgumentEncoder&, const std::chrono::system_clock::time_point&);
+ static bool decode(ArgumentDecoder&, std::chrono::system_clock::time_point&);
+};
+
</ins><span class="cx"> template<> struct ArgumentCoder<AtomicString> {
</span><span class="cx"> static void encode(ArgumentEncoder&, const AtomicString&);
</span><span class="cx"> static bool decode(ArgumentDecoder&, AtomicString&);
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/messages.py 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebKit2/Scripts/webkit/messages.py 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -451,6 +451,7 @@
</span><span class="cx"> 'WebKit::WebTouchEvent': ['"WebEvent.h"'],
</span><span class="cx"> 'WebKit::WebWheelEvent': ['"WebEvent.h"'],
</span><span class="cx"> 'WebKit::WebScriptMessageHandlerHandle': ['"WebScriptMessageHandler.h"'],
</span><ins>+ 'std::chrono::system_clock::time_point': ['<chrono>'],
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> headers = []
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.cpp 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -58,7 +58,10 @@
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerDeleteAllCookiesModifiedAfterDate(WKCookieManagerRef cookieManagerRef, double date)
</span><span class="cx"> {
</span><del>- toImpl(cookieManagerRef)->deleteAllCookiesModifiedAfterDate(date);
</del><ins>+ using namespace std::chrono;
+
+ auto time = system_clock::time_point(duration_cast<system_clock::duration>(duration<double>(date)));
+ toImpl(cookieManagerRef)->deleteAllCookiesModifiedSince(time);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKCookieManagerSetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, WKHTTPCookieAcceptPolicy policy)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKCookieManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCookieManager.h 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -73,6 +73,8 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKCookieManagerDeleteCookiesForHostname(WKCookieManagerRef cookieManager, WKStringRef hostname);
</span><span class="cx"> WK_EXPORT void WKCookieManagerDeleteAllCookies(WKCookieManagerRef cookieManager);
</span><ins>+
+// The time here is relative to the Unix epoch.
</ins><span class="cx"> WK_EXPORT void WKCookieManagerDeleteAllCookiesModifiedAfterDate(WKCookieManagerRef cookieManager, double);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT void WKCookieManagerSetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, WKHTTPCookieAcceptPolicy policy);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.cpp 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -129,9 +129,9 @@
</span><span class="cx"> context()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::DeleteAllCookies());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManagerProxy::deleteAllCookiesModifiedAfterDate(double date)
</del><ins>+void WebCookieManagerProxy::deleteAllCookiesModifiedSince(std::chrono::system_clock::time_point time)
</ins><span class="cx"> {
</span><del>- context()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::DeleteAllCookiesModifiedAfterDate(date));
</del><ins>+ context()->sendToNetworkingProcessRelaunchingIfNecessary(Messages::WebCookieManager::DeleteAllCookiesModifiedSince(time));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebCookieManagerProxy::startObservingCookieChanges()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebCookieManagerProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebKit2/UIProcess/WebCookieManagerProxy.h 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -63,7 +63,7 @@
</span><span class="cx"> void getHostnamesWithCookies(std::function<void (API::Array*, CallbackBase::Error)>);
</span><span class="cx"> void deleteCookiesForHostname(const String& hostname);
</span><span class="cx"> void deleteAllCookies();
</span><del>- void deleteAllCookiesModifiedAfterDate(double);
</del><ins>+ void deleteAllCookiesModifiedSince(std::chrono::system_clock::time_point);
</ins><span class="cx">
</span><span class="cx"> void setHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
</span><span class="cx"> void getHTTPCookieAcceptPolicy(std::function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)>);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessCookiesWebCookieManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.cpp 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -78,9 +78,9 @@
</span><span class="cx"> WebCore::deleteAllCookies(NetworkStorageSession::defaultStorageSession());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebCookieManager::deleteAllCookiesModifiedAfterDate(double date)
</del><ins>+void WebCookieManager::deleteAllCookiesModifiedSince(std::chrono::system_clock::time_point time)
</ins><span class="cx"> {
</span><del>- WebCore::deleteAllCookiesModifiedAfterDate(NetworkStorageSession::defaultStorageSession(), date);
</del><ins>+ WebCore::deleteAllCookiesModifiedSince(NetworkStorageSession::defaultStorageSession(), time);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebCookieManager::startObservingCookieChanges()
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessCookiesWebCookieManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.h 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> void getHostnamesWithCookies(uint64_t callbackID);
</span><span class="cx"> void deleteCookiesForHostname(const String&);
</span><span class="cx"> void deleteAllCookies();
</span><del>- void deleteAllCookiesModifiedAfterDate(double date);
</del><ins>+ void deleteAllCookiesModifiedSince(std::chrono::system_clock::time_point);
</ins><span class="cx">
</span><span class="cx"> void platformSetHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicy);
</span><span class="cx"> void getHTTPCookieAcceptPolicy(uint64_t callbackID);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessCookiesWebCookieManagermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.messages.in (176962 => 176963)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.messages.in 2014-12-08 20:34:47 UTC (rev 176962)
+++ trunk/Source/WebKit2/WebProcess/Cookies/WebCookieManager.messages.in 2014-12-08 20:36:27 UTC (rev 176963)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> void GetHostnamesWithCookies(uint64_t callbackID)
</span><span class="cx"> void DeleteCookiesForHostname(String hostname)
</span><span class="cx"> void DeleteAllCookies()
</span><del>- void DeleteAllCookiesModifiedAfterDate(double date)
</del><ins>+ void DeleteAllCookiesModifiedSince(std::chrono::system_clock::time_point time)
</ins><span class="cx">
</span><span class="cx"> void SetHTTPCookieAcceptPolicy(uint32_t policy)
</span><span class="cx"> void GetHTTPCookieAcceptPolicy(uint64_t callbackID)
</span></span></pre>
</div>
</div>
</body>
</html>