Diff
Modified: trunk/Source/WebKit2/ChangeLog (186252 => 186253)
--- 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)
@@ -1,3 +1,20 @@
+2015-07-02 Commit Queue <commit-qu...@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
+
2015-07-02 Jinwoo Song <jinwoo7.s...@samsung.com>
Unreviewed build fix for non-COCOA ports after r186247.
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (186252 => 186253)
--- 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)
@@ -348,13 +348,6 @@
void NetworkProcess::deleteWebsiteData(SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
{
-#if PLATFORM(COCOA)
- if (websiteDataTypes & WebsiteDataTypeHSTSCache) {
- if (auto* networkStorageSession = SessionTracker::session(sessionID))
- clearHSTSCache(*networkStorageSession, modifiedSince);
- }
-#endif
-
if (websiteDataTypes & WebsiteDataTypeCookies) {
if (auto* networkStorageSession = SessionTracker::session(sessionID))
deleteAllCookiesModifiedSince(*networkStorageSession, modifiedSince);
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (186252 => 186253)
--- 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)
@@ -45,7 +45,6 @@
namespace WebCore {
class CertificateInfo;
-class NetworkStorageSession;
class SecurityOrigin;
}
@@ -96,9 +95,6 @@
static void clearCFURLCacheForOrigins(const Vector<SecurityOriginData>&);
#endif
-#if PLATFORM(COCOA)
- void clearHSTSCache(WebCore::NetworkStorageSession&, std::chrono::system_clock::time_point modifiedSince);
-#endif
private:
NetworkProcess();
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (186252 => 186253)
--- 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)
@@ -34,7 +34,6 @@
#import "SandboxExtension.h"
#import "SecurityOriginData.h"
#import <WebCore/CFNetworkSPI.h>
-#import <WebCore/NetworkStorageSession.h>
#import <WebCore/PublicSuffix.h>
#import <WebCore/ResourceRequestCFNet.h>
#import <WebCore/SecurityOrigin.h>
@@ -213,14 +212,6 @@
}
}
-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);
-}
-
static void clearNSURLCache(dispatch_group_t group, std::chrono::system_clock::time_point modifiedSince, const std::function<void ()>& completionHandler)
{
dispatch_group_async(group, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), [modifiedSince, completionHandler] {
Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h (186252 => 186253)
--- 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)
@@ -38,9 +38,8 @@
WebsiteDataTypeWebSQLDatabases = 1 << 6,
WebsiteDataTypeIndexedDBDatabases = 1 << 7,
WebsiteDataTypeMediaKeys = 1 << 8,
- WebsiteDataTypeHSTSCache = 1 << 9,
#if ENABLE(NETSCAPE_PLUGIN_API)
- WebsiteDataTypePlugInData = 1 << 10,
+ WebsiteDataTypePlugInData = 1 << 9,
#endif
};
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm (186252 => 186253)
--- 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)
@@ -40,7 +40,6 @@
NSString * const WKWebsiteDataTypeIndexedDBDatabases = @"WKWebsiteDataTypeIndexedDBDatabases";
NSString * const _WKWebsiteDataTypeMediaKeys = @"_WKWebsiteDataTypeMediaKeys";
-NSString * const _WKWebsiteDataTypeHSTSCache = @"_WKWebsiteDataTypeHSTSCache";
#if PLATFORM(MAC)
NSString * const _WKWebsiteDataTypePlugInData = @"_WKWebsiteDataTypePlugInData";
@@ -75,8 +74,6 @@
[array addObject:@"Web SQL"];
if ([dataTypes containsObject:WKWebsiteDataTypeIndexedDBDatabases])
[array addObject:@"IndexedDB"];
- if ([dataTypes containsObject:_WKWebsiteDataTypeHSTSCache])
- [array addObject:@"HSTS Cache"];
if ([dataTypes containsObject:_WKWebsiteDataTypeMediaKeys])
[array addObject:@"Media Keys"];
#if PLATFORM(MAC)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h (186252 => 186253)
--- 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)
@@ -60,8 +60,6 @@
websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases;
if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeIndexedDBDatabases])
websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases;
- if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypeHSTSCache])
- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeHSTSCache;
if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypeMediaKeys])
websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMediaKeys;
#if ENABLE(NETSCAPE_PLUGIN_API)
@@ -93,8 +91,6 @@
[wkWebsiteDataTypes addObject:WKWebsiteDataTypeWebSQLDatabases];
if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases)
[wkWebsiteDataTypes addObject:WKWebsiteDataTypeIndexedDBDatabases];
- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeHSTSCache)
- [wkWebsiteDataTypes addObject:_WKWebsiteDataTypeHSTSCache];
if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeMediaKeys)
[wkWebsiteDataTypes addObject:_WKWebsiteDataTypeMediaKeys];
#if ENABLE(NETSCAPE_PLUGIN_API)
Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordPrivate.h (186252 => 186253)
--- 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)
@@ -27,7 +27,6 @@
#if WK_API_ENABLED
-WK_EXTERN NSString * const _WKWebsiteDataTypeHSTSCache WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
WK_EXTERN NSString * const _WKWebsiteDataTypeMediaKeys WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
#if !TARGET_OS_IPHONE
Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (186252 => 186253)
--- 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)
@@ -451,9 +451,6 @@
if (dataTypes & WebsiteDataTypeDiskCache && !isNonPersistentStore)
processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
- if (dataTypes & WebsiteDataTypeHSTSCache)
- processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
-
return processAccessType;
}
