<!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>[183028] trunk</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/183028">183028</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-04-20 14:48:01 -0700 (Mon, 20 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modify the WKWebsiteDataStore API to take a NSSet of types instead of a bitmask
https://bugs.webkit.org/show_bug.cgi?id=143966
Reviewed by Dan Bernstein.
Source/WebKit2:
* UIProcess/API/Cocoa/WKWebsiteDataRecord.h:
* UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
(dataTypesToString):
(-[WKWebsiteDataRecord dataTypes]):
* UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
(WebKit::toWebsiteDataTypes):
(WebKit::toWKWebsiteDataTypes):
* UIProcess/API/Cocoa/WKWebsiteDataStore.h:
* UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
(+[WKWebsiteDataStore allWebsiteDataTypes]):
(-[WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:]):
(-[WKWebsiteDataStore removeDataOfTypes:modifiedSince:completionHandler:]):
(-[WKWebsiteDataStore removeDataOfTypes:forDataRecords:completionHandler:]):
* UIProcess/API/Cocoa/_WKWebsiteDataRecord.h:
* UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
* UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
(toWKWebsiteDataTypes):
(-[_WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:]):
(-[_WKWebsiteDataStore removeDataOfTypes:forDataRecords:completionHandler:]):
(-[_WKWebsiteDataStore removeDataOfTypes:modifiedSince:completionHandler:]):
Tools:
* MiniBrowser/mac/WK2BrowserWindowController.m:
(dataTypes):
(-[WK2BrowserWindowController fetchWebsiteData:]):
(-[WK2BrowserWindowController fetchAndClearWebsiteData:]):
(-[WK2BrowserWindowController clearWebsiteData:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.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="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoremm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm">trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (183027 => 183028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-20 21:31:21 UTC (rev 183027)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-20 21:48:01 UTC (rev 183028)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2015-04-20 Anders Carlsson <andersca@apple.com>
+
+ Modify the WKWebsiteDataStore API to take a NSSet of types instead of a bitmask
+ https://bugs.webkit.org/show_bug.cgi?id=143966
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/Cocoa/WKWebsiteDataRecord.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataRecord.mm:
+ (dataTypesToString):
+ (-[WKWebsiteDataRecord dataTypes]):
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
+ (WebKit::toWebsiteDataTypes):
+ (WebKit::toWKWebsiteDataTypes):
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.h:
+ * UIProcess/API/Cocoa/WKWebsiteDataStore.mm:
+ (+[WKWebsiteDataStore allWebsiteDataTypes]):
+ (-[WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:]):
+ (-[WKWebsiteDataStore removeDataOfTypes:modifiedSince:completionHandler:]):
+ (-[WKWebsiteDataStore removeDataOfTypes:forDataRecords:completionHandler:]):
+ * UIProcess/API/Cocoa/_WKWebsiteDataRecord.h:
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.h:
+ * UIProcess/API/Cocoa/_WKWebsiteDataStore.mm:
+ (toWKWebsiteDataTypes):
+ (-[_WKWebsiteDataStore fetchDataRecordsOfTypes:completionHandler:]):
+ (-[_WKWebsiteDataStore removeDataOfTypes:forDataRecords:completionHandler:]):
+ (-[_WKWebsiteDataStore removeDataOfTypes:modifiedSince:completionHandler:]):
+
</ins><span class="cx"> 2015-04-20 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Should remove mouseForceClick and mouseForceCancelled from DOM force events
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h (183027 => 183028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h 2015-04-20 21:31:21 UTC (rev 183027)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.h 2015-04-20 21:48:01 UTC (rev 183028)
</span><span class="lines">@@ -31,24 +31,20 @@
</span><span class="cx">
</span><span class="cx"> WK_ASSUME_NONNULL_BEGIN
</span><span class="cx">
</span><del>-typedef NS_OPTIONS(NSUInteger, WKWebsiteDataTypes) {
- WKWebsiteDataTypeCookies = 1 << 0,
- WKWebsiteDataTypeDiskCache = 1 << 1,
- WKWebsiteDataTypeMemoryCache = 1 << 2,
- WKWebsiteDataTypeOfflineWebApplicationCache = 1 << 3,
</del><ins>+WK_EXTERN NSString * const WKWebsiteDataTypeDiskCache WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+WK_EXTERN NSString * const WKWebsiteDataTypeMemoryCache WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+WK_EXTERN NSString * const WKWebsiteDataTypeOfflineWebApplicationCache WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx">
</span><del>- WKWebsiteDataTypeLocalStorage = 1 << 4,
- WKWebsiteDataTypeWebSQLDatabases = 1 << 5,
</del><ins>+WK_EXTERN NSString * const WKWebsiteDataTypeCookies WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+WK_EXTERN NSString * const WKWebsiteDataTypeLocalStorage WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+WK_EXTERN NSString * const WKWebsiteDataTypeWebSQLDatabases WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx">
</span><del>- WKWebsiteDataTypeAll = NSUIntegerMax,
-} WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
-
</del><span class="cx"> WK_CLASS_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA)
</span><span class="cx"> @interface WKWebsiteDataRecord : NSObject
</span><span class="cx">
</span><span class="cx"> @property (nonatomic, readonly, copy) NSString *displayName;
</span><span class="cx">
</span><del>-@property (nonatomic, readonly) WKWebsiteDataTypes dataTypes;
</del><ins>+@property (nonatomic, readonly, copy) NSSet *dataTypes;
</ins><span class="cx">
</span><span class="cx"> @end
</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 (183027 => 183028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2015-04-20 21:31:21 UTC (rev 183027)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecord.mm 2015-04-20 21:48:01 UTC (rev 183028)
</span><span class="lines">@@ -28,6 +28,14 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+NSString * const WKWebsiteDataTypeDiskCache = @"WKWebsiteDataTypeDiskCache";
+NSString * const WKWebsiteDataTypeMemoryCache = @"WKWebsiteDataTypeMemoryCache";
+NSString * const WKWebsiteDataTypeOfflineWebApplicationCache = @"WKWebsiteDataTypeOfflineWebApplicationCache";
+
+NSString * const WKWebsiteDataTypeCookies = @"WKWebsiteDataTypeCookies";
+NSString * const WKWebsiteDataTypeLocalStorage = @"WKWebsiteDataTypeLocalStorage";
+NSString * const WKWebsiteDataTypeWebSQLDatabases = @"WKWebsiteDataTypeWebSQLDatabases";
+
</ins><span class="cx"> @implementation WKWebsiteDataRecord
</span><span class="cx">
</span><span class="cx"> - (void)dealloc
</span><span class="lines">@@ -37,21 +45,21 @@
</span><span class="cx"> [super dealloc];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static NSString *dataTypesToString(WKWebsiteDataTypes dataTypes)
</del><ins>+static NSString *dataTypesToString(NSSet *dataTypes)
</ins><span class="cx"> {
</span><span class="cx"> auto array = adoptNS([[NSMutableArray alloc] init]);
</span><span class="cx">
</span><del>- if (dataTypes & WKWebsiteDataTypeCookies)
- [array addObject:@"Cookies"];
- if (dataTypes & WKWebsiteDataTypeDiskCache)
</del><ins>+ if ([dataTypes containsObject:WKWebsiteDataTypeDiskCache])
</ins><span class="cx"> [array addObject:@"Disk Cache"];
</span><del>- if (dataTypes & WKWebsiteDataTypeMemoryCache)
</del><ins>+ if ([dataTypes containsObject:WKWebsiteDataTypeMemoryCache])
</ins><span class="cx"> [array addObject:@"Memory Cache"];
</span><del>- if (dataTypes & WKWebsiteDataTypeOfflineWebApplicationCache)
</del><ins>+ if ([dataTypes containsObject:WKWebsiteDataTypeOfflineWebApplicationCache])
</ins><span class="cx"> [array addObject:@"Offline Web Application Cache"];
</span><del>- if (dataTypes & WKWebsiteDataTypeLocalStorage)
</del><ins>+ if ([dataTypes containsObject:WKWebsiteDataTypeCookies])
+ [array addObject:@"Cookies"];
+ if ([dataTypes containsObject:WKWebsiteDataTypeLocalStorage])
</ins><span class="cx"> [array addObject:@"Local Storage"];
</span><del>- if (dataTypes & WKWebsiteDataTypeWebSQLDatabases)
</del><ins>+ if ([dataTypes containsObject:WKWebsiteDataTypeWebSQLDatabases])
</ins><span class="cx"> [array addObject:@"Web SQL"];
</span><span class="cx">
</span><span class="cx"> return [array componentsJoinedByString:@", "];
</span><span class="lines">@@ -67,9 +75,9 @@
</span><span class="cx"> return _websiteDataRecord->websiteDataRecord().displayName;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (WKWebsiteDataTypes)dataTypes
</del><ins>+- (NSSet *)dataTypes
</ins><span class="cx"> {
</span><del>- return WebKit::toWKWebsiteDataTypes(_websiteDataRecord->websiteDataRecord().types);
</del><ins>+ return WebKit::toWKWebsiteDataTypes(_websiteDataRecord->websiteDataRecord().types).autorelease();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma mark WKObject protocol implementation
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h (183027 => 183028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2015-04-20 21:31:21 UTC (rev 183027)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2015-04-20 21:48:01 UTC (rev 183028)
</span><span class="lines">@@ -38,46 +38,46 @@
</span><span class="cx"> return (WKWebsiteDataRecord *)websiteDataRecord.wrapper();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline WebKit::WebsiteDataTypes toWebsiteDataTypes(WKWebsiteDataTypes wkWebsiteDataTypes)
</del><ins>+static inline WebKit::WebsiteDataTypes toWebsiteDataTypes(NSSet *wkWebsiteDataTypes)
</ins><span class="cx"> {
</span><span class="cx"> using WebsiteDataTypes = WebKit::WebsiteDataTypes;
</span><span class="cx">
</span><span class="cx"> int websiteDataTypes = 0;
</span><span class="cx">
</span><del>- if (wkWebsiteDataTypes & WKWebsiteDataTypeCookies)
</del><ins>+ if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeCookies])
</ins><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeCookies;
</span><del>- if (wkWebsiteDataTypes & WKWebsiteDataTypeDiskCache)
</del><ins>+ if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeDiskCache])
</ins><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeDiskCache;
</span><del>- if (wkWebsiteDataTypes & WKWebsiteDataTypeMemoryCache)
</del><ins>+ if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeMemoryCache])
</ins><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMemoryCache;
</span><del>- if (wkWebsiteDataTypes & WKWebsiteDataTypeOfflineWebApplicationCache)
</del><ins>+ if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeOfflineWebApplicationCache])
</ins><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeOfflineWebApplicationCache;
</span><del>- if (wkWebsiteDataTypes & WKWebsiteDataTypeLocalStorage)
</del><ins>+ if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeLocalStorage])
</ins><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeLocalStorage;
</span><del>- if (wkWebsiteDataTypes & WKWebsiteDataTypeWebSQLDatabases)
</del><ins>+ if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeWebSQLDatabases])
</ins><span class="cx"> websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases;
</span><span class="cx">
</span><span class="cx"> return static_cast<WebsiteDataTypes>(websiteDataTypes);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline WKWebsiteDataTypes toWKWebsiteDataTypes(int websiteDataTypes)
</del><ins>+static inline RetainPtr<NSSet> toWKWebsiteDataTypes(int websiteDataTypes)
</ins><span class="cx"> {
</span><span class="cx"> using WebsiteDataTypes = WebKit::WebsiteDataTypes;
</span><span class="cx">
</span><del>- WKWebsiteDataTypes wkWebsiteDataTypes = 0;
</del><ins>+ auto wkWebsiteDataTypes = adoptNS([[NSMutableSet alloc] init]);
</ins><span class="cx">
</span><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeCookies)
</span><del>- wkWebsiteDataTypes |= WKWebsiteDataTypeCookies;
</del><ins>+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeCookies];
</ins><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeDiskCache)
</span><del>- wkWebsiteDataTypes |= WKWebsiteDataTypeDiskCache;
</del><ins>+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeDiskCache];
</ins><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeMemoryCache)
</span><del>- wkWebsiteDataTypes |= WKWebsiteDataTypeMemoryCache;
</del><ins>+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeMemoryCache];
</ins><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeOfflineWebApplicationCache)
</span><del>- wkWebsiteDataTypes |= WKWebsiteDataTypeOfflineWebApplicationCache;
</del><ins>+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeOfflineWebApplicationCache];
</ins><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeLocalStorage)
</span><del>- wkWebsiteDataTypes |= WKWebsiteDataTypeLocalStorage;
</del><ins>+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeLocalStorage];
</ins><span class="cx"> if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases)
</span><del>- wkWebsiteDataTypes |= WKWebsiteDataTypeWebSQLDatabases;
</del><ins>+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeWebSQLDatabases];
</ins><span class="cx">
</span><span class="cx"> return wkWebsiteDataTypes;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h (183027 => 183028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2015-04-20 21:31:21 UTC (rev 183027)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.h 2015-04-20 21:48:01 UTC (rev 183028)
</span><span class="lines">@@ -44,10 +44,12 @@
</span><span class="cx">
</span><span class="cx"> @property (readonly, getter=isNonPersistent) BOOL nonPersistent;
</span><span class="cx">
</span><del>-- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler;
-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler;
-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler;
</del><ins>++ (NSSet *)allWebsiteDataTypes;
</ins><span class="cx">
</span><ins>+- (void)fetchDataRecordsOfTypes:(NSSet *)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler;
+- (void)removeDataOfTypes:(NSSet *)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler;
+- (void)removeDataOfTypes:(NSSet *)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> WK_ASSUME_NONNULL_END
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm (183027 => 183028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2015-04-20 21:31:21 UTC (rev 183027)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataStore.mm 2015-04-20 21:48:01 UTC (rev 183028)
</span><span class="lines">@@ -55,6 +55,17 @@
</span><span class="cx"> return _websiteDataStore->isNonPersistent();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>++ (NSSet *)allWebsiteDataTypes
+{
+ static dispatch_once_t onceToken;
+ static NSSet *allWebsiteDataTypes;
+ dispatch_once(&onceToken, ^{
+ allWebsiteDataTypes = [[NSSet alloc] initWithArray:@[ WKWebsiteDataTypeDiskCache, WKWebsiteDataTypeMemoryCache, WKWebsiteDataTypeOfflineWebApplicationCache, WKWebsiteDataTypeCookies, WKWebsiteDataTypeLocalStorage, WKWebsiteDataTypeWebSQLDatabases ]];
+ });
+
+ return allWebsiteDataTypes;
+}
+
</ins><span class="cx"> static std::chrono::system_clock::time_point toSystemClockTime(NSDate *date)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(date);
</span><span class="lines">@@ -63,7 +74,7 @@
</span><span class="cx"> return system_clock::time_point(duration_cast<system_clock::duration>(duration<double>(date.timeIntervalSince1970)));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler
</del><ins>+- (void)fetchDataRecordsOfTypes:(NSSet *)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler
</ins><span class="cx"> {
</span><span class="cx"> auto completionHandlerCopy = Block_copy(completionHandler);
</span><span class="cx">
</span><span class="lines">@@ -80,7 +91,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler
</del><ins>+- (void)removeDataOfTypes:(NSSet *)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler
</ins><span class="cx"> {
</span><span class="cx"> auto completionHandlerCopy = Block_copy(completionHandler);
</span><span class="cx"> _websiteDataStore->websiteDataStore().removeData(WebKit::toWebsiteDataTypes(websiteDataTypes), toSystemClockTime(date ? date : [NSDate distantPast]), [completionHandlerCopy] {
</span><span class="lines">@@ -99,7 +110,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler
</del><ins>+- (void)removeDataOfTypes:(NSSet *)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler
</ins><span class="cx"> {
</span><span class="cx"> auto completionHandlerCopy = Block_copy(completionHandler);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h (183027 => 183028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-04-20 21:31:21 UTC (rev 183027)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.h 2015-04-20 21:48:01 UTC (rev 183028)
</span><span class="lines">@@ -29,12 +29,21 @@
</span><span class="cx">
</span><span class="cx"> #import <WebKit/WKWebsiteDataStore.h>
</span><span class="cx">
</span><ins>+typedef NS_OPTIONS(NSUInteger, WKWebsiteDataTypes) {
+ WKWebsiteDataTypeAll = NSUIntegerMax,
+} WK_ENUM_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
+
+
</ins><span class="cx"> WK_CLASS_DEPRECATED(10_10, WK_MAC_TBA, 8_0, WK_IOS_TBA, "Please use WKWebsiteDataStore instead")
</span><span class="cx"> @interface _WKWebsiteDataStore : WKWebsiteDataStore
</span><span class="cx">
</span><span class="cx"> + (_WKWebsiteDataStore *)defaultDataStore;
</span><span class="cx"> + (_WKWebsiteDataStore *)nonPersistentDataStore;
</span><span class="cx">
</span><ins>+- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler;
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler;
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoa_WKWebsiteDataStoremm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm (183027 => 183028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-04-20 21:31:21 UTC (rev 183027)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStore.mm 2015-04-20 21:48:01 UTC (rev 183028)
</span><span class="lines">@@ -28,11 +28,43 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import <wtf/RetainPtr.h>
+
+typedef NS_OPTIONS(NSUInteger, _WKWebsiteDataTypes) {
+ _WKWebsiteDataTypeCookies = 1 << 0,
+ _WKWebsiteDataTypeDiskCache = 1 << 1,
+ _WKWebsiteDataTypeMemoryCache = 1 << 2,
+ _WKWebsiteDataTypeOfflineWebApplicationCache = 1 << 3,
+
+ _WKWebsiteDataTypeLocalStorage = 1 << 4,
+ _WKWebsiteDataTypeWebSQLDatabases = 1 << 5,
+};
+
</ins><span class="cx"> #pragma clang diagnostic push
</span><span class="cx"> #pragma clang diagnostic ignored "-Wdeprecated-declarations"
</span><span class="cx">
</span><span class="cx"> @implementation _WKWebsiteDataStore
</span><span class="cx">
</span><ins>+static RetainPtr<NSSet> toWKWebsiteDataTypes(_WKWebsiteDataTypes websiteDataTypes)
+{
+ auto wkWebsiteDataTypes = adoptNS([[NSMutableSet alloc] init]);
+
+ if (websiteDataTypes & _WKWebsiteDataTypeCookies)
+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeCookies];
+ if (websiteDataTypes & _WKWebsiteDataTypeDiskCache)
+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeDiskCache];
+ if (websiteDataTypes & _WKWebsiteDataTypeMemoryCache)
+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeMemoryCache];
+ if (websiteDataTypes & _WKWebsiteDataTypeOfflineWebApplicationCache)
+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeOfflineWebApplicationCache];
+ if (websiteDataTypes & _WKWebsiteDataTypeLocalStorage)
+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeLocalStorage];
+ if (websiteDataTypes & _WKWebsiteDataTypeWebSQLDatabases)
+ [wkWebsiteDataTypes addObject:WKWebsiteDataTypeWebSQLDatabases];
+
+ return wkWebsiteDataTypes;
+}
+
</ins><span class="cx"> + (_WKWebsiteDataStore *)defaultDataStore
</span><span class="cx"> {
</span><span class="cx"> return (_WKWebsiteDataStore *)[WKWebsiteDataStore defaultDataStore];
</span><span class="lines">@@ -43,6 +75,21 @@
</span><span class="cx"> return (_WKWebsiteDataStore *)[WKWebsiteDataStore nonPersistentDataStore];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)fetchDataRecordsOfTypes:(WKWebsiteDataTypes)websiteDataTypes completionHandler:(void (^)(NSArray *))completionHandler
+{
+ [super fetchDataRecordsOfTypes:toWKWebsiteDataTypes(websiteDataTypes).get() completionHandler:completionHandler];
+}
+
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes forDataRecords:(NSArray *)dataRecords completionHandler:(void (^)())completionHandler
+{
+ [super removeDataOfTypes:toWKWebsiteDataTypes(websiteDataTypes).get() forDataRecords:dataRecords completionHandler:completionHandler];
+}
+
+- (void)removeDataOfTypes:(WKWebsiteDataTypes)websiteDataTypes modifiedSince:(NSDate *)date completionHandler:(void (^)())completionHandler
+{
+ [super removeDataOfTypes:toWKWebsiteDataTypes(websiteDataTypes).get() modifiedSince:date completionHandler:completionHandler];
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #pragma clang diagnostic pop
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183027 => 183028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-20 21:31:21 UTC (rev 183027)
+++ trunk/Tools/ChangeLog 2015-04-20 21:48:01 UTC (rev 183028)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-04-20 Anders Carlsson <andersca@apple.com>
+
+ Modify the WKWebsiteDataStore API to take a NSSet of types instead of a bitmask
+ https://bugs.webkit.org/show_bug.cgi?id=143966
+
+ Reviewed by Dan Bernstein.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (dataTypes):
+ (-[WK2BrowserWindowController fetchWebsiteData:]):
+ (-[WK2BrowserWindowController fetchAndClearWebsiteData:]):
+ (-[WK2BrowserWindowController clearWebsiteData:]):
+
</ins><span class="cx"> 2015-04-20 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix content extension test flakiness.
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (183027 => 183028)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-04-20 21:31:21 UTC (rev 183027)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2015-04-20 21:48:01 UTC (rev 183028)
</span><span class="lines">@@ -440,20 +440,23 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const WKWebsiteDataTypes dataTypes = WKWebsiteDataTypeAll;
</del><ins>+static NSSet *dataTypes()
+{
+ return [WKWebsiteDataStore allWebsiteDataTypes];
+}
</ins><span class="cx">
</span><span class="cx"> - (IBAction)fetchWebsiteData:(id)sender
</span><span class="cx"> {
</span><del>- [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
</del><ins>+ [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes() completionHandler:^(NSArray *websiteDataRecords) {
</ins><span class="cx"> NSLog(@"did fetch website data %@.", websiteDataRecords);
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)fetchAndClearWebsiteData:(id)sender
</span><span class="cx"> {
</span><del>- [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
- [_configuration.websiteDataStore removeDataOfTypes:dataTypes forDataRecords:websiteDataRecords completionHandler:^{
- [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes completionHandler:^(NSArray *websiteDataRecords) {
</del><ins>+ [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes() completionHandler:^(NSArray *websiteDataRecords) {
+ [_configuration.websiteDataStore removeDataOfTypes:dataTypes() forDataRecords:websiteDataRecords completionHandler:^{
+ [_configuration.websiteDataStore fetchDataRecordsOfTypes:dataTypes() completionHandler:^(NSArray *websiteDataRecords) {
</ins><span class="cx"> NSLog(@"did clear website data, after clearing data is %@.", websiteDataRecords);
</span><span class="cx"> }];
</span><span class="cx"> }];
</span><span class="lines">@@ -462,7 +465,7 @@
</span><span class="cx">
</span><span class="cx"> - (IBAction)clearWebsiteData:(id)sender
</span><span class="cx"> {
</span><del>- [_configuration.websiteDataStore removeDataOfTypes:dataTypes modifiedSince:[NSDate distantPast] completionHandler:^{
</del><ins>+ [_configuration.websiteDataStore removeDataOfTypes:dataTypes() modifiedSince:[NSDate distantPast] completionHandler:^{
</ins><span class="cx"> NSLog(@"Did clear website data.");
</span><span class="cx"> }];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>