<!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>[186253] 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/186253">186253</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-07-02 19:35:08 -0700 (Thu, 02 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/186247">r186247</a> and <a href="http://trac.webkit.org/projects/webkit/changeset/186250">r186250</a>.
https://bugs.webkit.org/show_bug.cgi?id=146572
Broke the build on Mavericks bots (Requested by cdumez on
#webkit).
Reverted changesets:
"Provide API to clear the HSTS cache"
https://bugs.webkit.org/show_bug.cgi?id=146565
http://trac.webkit.org/changeset/186247
"Unreviewed build fix for non-COCOA ports after <a href="http://trac.webkit.org/projects/webkit/changeset/186247">r186247</a>."
http://trac.webkit.org/changeset/186250
Patch by Commit Queue <commit-queue@webkit.org> on 2015-07-02</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkProcessh">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm">trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm</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>
<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 (186252 => 186253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-03 01:48:01 UTC (rev 186252)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-03 02:35:08 UTC (rev 186253)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-02 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r186247 and r186250.
+ https://bugs.webkit.org/show_bug.cgi?id=146572
+
+ Broke the build on Mavericks bots (Requested by cdumez on
+ #webkit).
+
+ Reverted changesets:
+
+ "Provide API to clear the HSTS cache"
+ https://bugs.webkit.org/show_bug.cgi?id=146565
+ http://trac.webkit.org/changeset/186247
+
+ "Unreviewed build fix for non-COCOA ports after r186247."
+ http://trac.webkit.org/changeset/186250
+
</ins><span class="cx"> 2015-07-02 Jinwoo Song <jinwoo7.song@samsung.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for non-COCOA ports after r186247.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (186252 => 186253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-07-03 01:48:01 UTC (rev 186252)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2015-07-03 02:35:08 UTC (rev 186253)
</span><span class="lines">@@ -348,13 +348,6 @@
</span><span class="cx">
</span><span class="cx"> void NetworkProcess::deleteWebsiteData(SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</span><span class="cx"> {
</span><del>-#if PLATFORM(COCOA)
- if (websiteDataTypes & WebsiteDataTypeHSTSCache) {
- if (auto* networkStorageSession = SessionTracker::session(sessionID))
- clearHSTSCache(*networkStorageSession, modifiedSince);
- }
-#endif
-
</del><span class="cx"> if (websiteDataTypes & WebsiteDataTypeCookies) {
</span><span class="cx"> if (auto* networkStorageSession = SessionTracker::session(sessionID))
</span><span class="cx"> deleteAllCookiesModifiedSince(*networkStorageSession, modifiedSince);
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (186252 => 186253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-07-03 01:48:01 UTC (rev 186252)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2015-07-03 02:35:08 UTC (rev 186253)
</span><span class="lines">@@ -45,7 +45,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class CertificateInfo;
</span><del>-class NetworkStorageSession;
</del><span class="cx"> class SecurityOrigin;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -96,9 +95,6 @@
</span><span class="cx"> static void clearCFURLCacheForOrigins(const Vector<SecurityOriginData>&);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if PLATFORM(COCOA)
- void clearHSTSCache(WebCore::NetworkStorageSession&, std::chrono::system_clock::time_point modifiedSince);
-#endif
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NetworkProcess();
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesscocoaNetworkProcessCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (186252 => 186253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-07-03 01:48:01 UTC (rev 186252)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-07-03 02:35:08 UTC (rev 186253)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #import "SandboxExtension.h"
</span><span class="cx"> #import "SecurityOriginData.h"
</span><span class="cx"> #import <WebCore/CFNetworkSPI.h>
</span><del>-#import <WebCore/NetworkStorageSession.h>
</del><span class="cx"> #import <WebCore/PublicSuffix.h>
</span><span class="cx"> #import <WebCore/ResourceRequestCFNet.h>
</span><span class="cx"> #import <WebCore/SecurityOrigin.h>
</span><span class="lines">@@ -213,14 +212,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::clearHSTSCache(WebCore::NetworkStorageSession& session, std::chrono::system_clock::time_point modifiedSince)
-{
- NSTimeInterval timeInterval = std::chrono::duration_cast<std::chrono::duration<double>>(modifiedSince.time_since_epoch()).count();
- NSDate *date = [NSDate dateWithTimeIntervalSince1970:timeInterval];
-
- _CFNetworkResetHSTSHostsSinceDate(session.platformSession(), (__bridge CFDateRef)date);
-}
-
</del><span class="cx"> static void clearNSURLCache(dispatch_group_t group, std::chrono::system_clock::time_point modifiedSince, const std::function<void ()>& completionHandler)
</span><span class="cx"> {
</span><span class="cx"> dispatch_group_async(group, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [modifiedSince, completionHandler] {
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h (186252 => 186253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-07-03 01:48:01 UTC (rev 186252)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2015-07-03 02:35:08 UTC (rev 186253)
</span><span class="lines">@@ -38,9 +38,8 @@
</span><span class="cx"> WebsiteDataTypeWebSQLDatabases = 1 << 6,
</span><span class="cx"> WebsiteDataTypeIndexedDBDatabases = 1 << 7,
</span><span class="cx"> WebsiteDataTypeMediaKeys = 1 << 8,
</span><del>- WebsiteDataTypeHSTSCache = 1 << 9,
</del><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- WebsiteDataTypePlugInData = 1 << 10,
</del><ins>+ WebsiteDataTypePlugInData = 1 << 9,
</ins><span class="cx"> #endif
</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 (186252 => 186253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2015-07-03 01:48:01 UTC (rev 186252)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2015-07-03 02:35:08 UTC (rev 186253)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> NSString * const WKWebsiteDataTypeIndexedDBDatabases = @"WKWebsiteDataTypeIndexedDBDatabases";
</span><span class="cx">
</span><span class="cx"> NSString * const _WKWebsiteDataTypeMediaKeys = @"_WKWebsiteDataTypeMediaKeys";
</span><del>-NSString * const _WKWebsiteDataTypeHSTSCache = @"_WKWebsiteDataTypeHSTSCache";
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> NSString * const _WKWebsiteDataTypePlugInData = @"_WKWebsiteDataTypePlugInData";
</span><span class="lines">@@ -75,8 +74,6 @@
</span><span class="cx"> [array addObject:@"Web SQL"];
</span><span class="cx"> if ([dataTypes containsObject:WKWebsiteDataTypeIndexedDBDatabases])
</span><span class="cx"> [array addObject:@"IndexedDB"];
</span><del>- if ([dataTypes containsObject:_WKWebsiteDataTypeHSTSCache])
- [array addObject:@"HSTS Cache"];
</del><span class="cx"> if ([dataTypes containsObject:_WKWebsiteDataTypeMediaKeys])
</span><span class="cx"> [array addObject:@"Media Keys"];
</span><span class="cx"> #if PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h (186252 => 186253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2015-07-03 01:48:01 UTC (rev 186252)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2015-07-03 02:35:08 UTC (rev 186253)
</span><span class="lines">@@ -60,8 +60,6 @@
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases;
</span><span class="cx"> if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeIndexedDBDatabases])
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases;
</span><del>- if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypeHSTSCache])
- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeHSTSCache;
</del><span class="cx"> if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypeMediaKeys])
</span><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMediaKeys;
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="lines">@@ -93,8 +91,6 @@
</span><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeWebSQLDatabases];
</span><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases)
</span><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeIndexedDBDatabases];
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeHSTSCache)
- [wkWebsiteDataTypes addObject:_WKWebsiteDataTypeHSTSCache];
</del><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeMediaKeys)
</span><span class="cx"> [wkWebsiteDataTypes addObject:_WKWebsiteDataTypeMediaKeys];
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h (186252 => 186253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2015-07-03 01:48:01 UTC (rev 186252)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h 2015-07-03 02:35:08 UTC (rev 186253)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><del>-WK_EXTERN NSString * const _WKWebsiteDataTypeHSTSCache WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</del><span class="cx"> WK_EXTERN NSString * const _WKWebsiteDataTypeMediaKeys WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (186252 => 186253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-07-03 01:48:01 UTC (rev 186252)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2015-07-03 02:35:08 UTC (rev 186253)
</span><span class="lines">@@ -451,9 +451,6 @@
</span><span class="cx"> if (dataTypes & WebsiteDataTypeDiskCache && !isNonPersistentStore)
</span><span class="cx"> processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeHSTSCache)
- processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
-
</del><span class="cx"> return processAccessType;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>