<!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>[197191] 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/197191">197191</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-26 11:49:36 -0800 (Fri, 26 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add WTF::OptionSet and use it for the website data types enum
https://bugs.webkit.org/show_bug.cgi?id=154733
Reviewed by Geoffrey Garen.
Source/WebKit2:
This is a pretty mechanical change:
Convert all uses of the WebsiteDataTypes enum to WTF::OptionSet. Rename the WebsiteDataTypes enum to
WebsiteDataType (since it only represents a single data type), and rename headers. Encode and decode WTF::OptionSet properly.
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::fetchWebsiteData):
(WebKit::DatabaseProcess::deleteWebsiteData):
(WebKit::DatabaseProcess::deleteWebsiteDataForOrigins):
* DatabaseProcess/DatabaseProcess.h:
* DatabaseProcess/DatabaseProcess.messages.in:
* NetworkProcess/NetworkProcess.cpp:
(WebKit::fetchDiskCacheEntries):
(WebKit::NetworkProcess::fetchWebsiteData):
(WebKit::NetworkProcess::deleteWebsiteData):
(WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
* NetworkProcess/NetworkProcess.h:
* NetworkProcess/NetworkProcess.messages.in:
* Platform/IPC/ArgumentCoders.h:
(IPC::ArgumentCoder<OptionSet<T>>::encode):
(IPC::ArgumentCoder<OptionSet<T>>::decode):
* Scripts/webkit/messages.py:
(class_template_headers):
* Shared/WebsiteData/WebsiteData.h:
* Shared/WebsiteData/WebsiteDataType.h: Renamed from Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h.
* UIProcess/API/C/WKApplicationCacheManager.cpp:
(WKApplicationCacheManagerGetApplicationCacheOrigins):
(WKApplicationCacheManagerDeleteEntriesForOrigin):
(WKApplicationCacheManagerDeleteAllEntries):
* UIProcess/API/C/WKResourceCacheManager.cpp:
(toWebsiteDataTypes):
(WKResourceCacheManagerClearCacheForOrigin):
* UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
(WebKit::toWebsiteDataTypes):
(WebKit::toWKWebsiteDataTypes):
* UIProcess/Databases/DatabaseProcessProxy.cpp:
(WebKit::DatabaseProcessProxy::fetchWebsiteData):
(WebKit::DatabaseProcessProxy::deleteWebsiteData):
(WebKit::DatabaseProcessProxy::deleteWebsiteDataForOrigins):
* UIProcess/Databases/DatabaseProcessProxy.h:
* UIProcess/Network/NetworkProcessProxy.cpp:
(WebKit::NetworkProcessProxy::fetchWebsiteData):
(WebKit::NetworkProcessProxy::deleteWebsiteData):
(WebKit::NetworkProcessProxy::deleteWebsiteDataForOrigins):
* UIProcess/Network/NetworkProcessProxy.h:
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::fetchWebsiteData):
(WebKit::WebProcessProxy::deleteWebsiteData):
(WebKit::WebProcessProxy::deleteWebsiteDataForOrigins):
* UIProcess/WebProcessProxy.h:
* UIProcess/WebsiteData/WebsiteDataRecord.cpp:
(WebKit::WebsiteDataRecord::add):
(WebKit::WebsiteDataRecord::addCookieHostName):
(WebKit::WebsiteDataRecord::addPluginDataHostName):
* UIProcess/WebsiteData/WebsiteDataRecord.h:
* UIProcess/WebsiteData/WebsiteDataStore.cpp:
(WebKit::computeNetworkProcessAccessTypeForDataFetch):
(WebKit::computeWebProcessAccessTypeForDataFetch):
(WebKit::WebsiteDataStore::fetchData):
(WebKit::computeNetworkProcessAccessTypeForDataRemoval):
(WebKit::computeWebProcessAccessTypeForDataRemoval):
(WebKit::WebsiteDataStore::removeData):
* UIProcess/WebsiteData/WebsiteDataStore.h:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebProcess.cpp:
(WebKit::WebProcess::fetchWebsiteData):
(WebKit::WebProcess::deleteWebsiteData):
(WebKit::WebProcess::deleteWebsiteDataForOrigins):
* WebProcess/WebProcess.h:
* WebProcess/WebProcess.messages.in:
Source/WTF:
Add WTF::OptionSet which makes it easier to use strong enums as flags.
* WTF.xcodeproj/project.pbxproj:
* wtf/Forward.h:
* wtf/OptionSet.h: Copied from Source/WebKit2/Shared/WebsiteData/WebsiteData.h.
(WTF::OptionSet::fromRaw):
(WTF::OptionSet::OptionSet):
(WTF::OptionSet::toRaw):
(WTF::OptionSet::contains):
(WTF::OptionSet::operator|=):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWTFwtfForwardh">trunk/Source/WTF/wtf/Forward.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessh">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessmessagesin">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in</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="#trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin">trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in</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="#trunkSourceWebKit2SharedWebsiteDataWebsiteDatah">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKApplicationCacheManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKResourceCacheManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordInternalh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp">trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessDatabasesDatabaseProcessProxyh">trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh">trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxycpp">trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebProcessProxyh">trunk/Source/WebKit2/UIProcess/WebProcessProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataRecordcpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataRecordh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh">trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessh">trunk/Source/WebKit2/WebProcess/WebProcess.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcessmessagesin">trunk/Source/WebKit2/WebProcess/WebProcess.messages.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfOptionSeth">trunk/Source/WTF/wtf/OptionSet.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypeh">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataType.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh">trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WTF/ChangeLog 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-02-26 Anders Carlsson <andersca@apple.com>
+
+ Add WTF::OptionSet and use it for the website data types enum
+ https://bugs.webkit.org/show_bug.cgi?id=154733
+
+ Reviewed by Geoffrey Garen.
+
+ Add WTF::OptionSet which makes it easier to use strong enums as flags.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/Forward.h:
+ * wtf/OptionSet.h: Copied from Source/WebKit2/Shared/WebsiteData/WebsiteData.h.
+ (WTF::OptionSet::fromRaw):
+ (WTF::OptionSet::OptionSet):
+ (WTF::OptionSet::toRaw):
+ (WTF::OptionSet::contains):
+ (WTF::OptionSet::operator|=):
+
</ins><span class="cx"> 2016-02-26 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r197168.
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -81,6 +81,7 @@
</span><span class="cx"> 1A1D8B9C173186CE00141DA4 /* FunctionDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1D8B9B173186CE00141DA4 /* FunctionDispatcher.h */; };
</span><span class="cx"> 1A1D8B9E1731879800141DA4 /* FunctionDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1D8B9D1731879800141DA4 /* FunctionDispatcher.cpp */; };
</span><span class="cx"> 1A233C7D17DAA6E300A93ACF /* MallocPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A233C7C17DAA6E300A93ACF /* MallocPtr.h */; };
</span><ins>+ 1A4656191C7FC68E00F5920F /* OptionSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4656181C7FC68E00F5920F /* OptionSet.h */; };
</ins><span class="cx"> 1A6BB769162F300500DD16DB /* StreamBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6BB768162F300500DD16DB /* StreamBuffer.h */; };
</span><span class="cx"> 1A6EB1E0187D0BD30030126F /* StringView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6EB1DF187D0BD30030126F /* StringView.h */; };
</span><span class="cx"> 1A944F471C3D8814005BD28C /* BlockPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A944F461C3D8814005BD28C /* BlockPtr.h */; };
</span><span class="lines">@@ -389,6 +390,7 @@
</span><span class="cx"> 1A1D8B9D1731879800141DA4 /* FunctionDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FunctionDispatcher.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A233C7C17DAA6E300A93ACF /* MallocPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MallocPtr.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A3F6BE6174ADA2100B2EEA7 /* NeverDestroyed.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NeverDestroyed.h; sourceTree = "<group>"; };
</span><ins>+ 1A4656181C7FC68E00F5920F /* OptionSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionSet.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1A6BB768162F300500DD16DB /* StreamBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamBuffer.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A6EB1DF187D0BD30030126F /* StringView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringView.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A944F461C3D8814005BD28C /* BlockPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlockPtr.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -850,6 +852,7 @@
</span><span class="cx"> A8A472D6151A825B004123FF /* NumberOfCores.h */,
</span><span class="cx"> 7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */,
</span><span class="cx"> 1AFDE6521953B23D00C48FFA /* Optional.h */,
</span><ins>+ 1A4656181C7FC68E00F5920F /* OptionSet.h */,
</ins><span class="cx"> 0F9495831C571CC900413A48 /* OrderMaker.h */,
</span><span class="cx"> A8A472D7151A825B004123FF /* OSAllocator.h */,
</span><span class="cx"> A8A472D8151A825B004123FF /* OSAllocatorPosix.cpp */,
</span><span class="lines">@@ -1117,7 +1120,6 @@
</span><span class="cx"> A8A47385151A825B004123FF /* ASCIICType.h in Headers */,
</span><span class="cx"> A8A47434151A825B004123FF /* ASCIIFastPath.h in Headers */,
</span><span class="cx"> A8A47387151A825B004123FF /* Assertions.h in Headers */,
</span><del>- 0F3501641BB258D500F0A2A3 /* WeakRandom.h in Headers */,
</del><span class="cx"> A8A47388151A825B004123FF /* Atomics.h in Headers */,
</span><span class="cx"> A8A47436151A825B004123FF /* AtomicString.h in Headers */,
</span><span class="cx"> A8A47437151A825B004123FF /* AtomicStringHash.h in Headers */,
</span><span class="lines">@@ -1127,16 +1129,16 @@
</span><span class="cx"> 0FB14E19180FA218009B6B4D /* Bag.h in Headers */,
</span><span class="cx"> 0FB14E1B1810E1DC009B6B4D /* BagToHashMap.h in Headers */,
</span><span class="cx"> 8134013915B092FD001FF0B8 /* Base64.h in Headers */,
</span><del>- 0FEB3DD11BB7366B009D7AAD /* ParallelVectorIterator.h in Headers */,
</del><span class="cx"> A8A473A9151A825B004123FF /* bignum-dtoa.h in Headers */,
</span><span class="cx"> A8A473AB151A825B004123FF /* bignum.h in Headers */,
</span><del>- 0FFF19DD1BB334EB00886D91 /* ParallelHelperPool.h in Headers */,
</del><span class="cx"> A8A47452151A825B004123FF /* BinarySemaphore.h in Headers */,
</span><span class="cx"> A8A4738A151A825B004123FF /* Bitmap.h in Headers */,
</span><span class="cx"> A8A4738C151A825B004123FF /* BitVector.h in Headers */,
</span><del>- A5098B021C16A4F900087797 /* SecuritySPI.h in Headers */,
</del><ins>+ 1A944F471C3D8814005BD28C /* BlockPtr.h in Headers */,
</ins><span class="cx"> A8A4738E151A825B004123FF /* BlockStack.h in Headers */,
</span><span class="cx"> A8A4738F151A825B004123FF /* BloomFilter.h in Headers */,
</span><ins>+ 0F93274B1C17F4B700CF6564 /* Box.h in Headers */,
+ 0F4570451BE834410062A629 /* BubbleSort.h in Headers */,
</ins><span class="cx"> A8A47391151A825B004123FF /* BumpPointerAllocator.h in Headers */,
</span><span class="cx"> EB95E1F0161A72410089A2F5 /* ByteOrder.h in Headers */,
</span><span class="cx"> A8A473AD151A825B004123FF /* cached-powers.h in Headers */,
</span><span class="lines">@@ -1162,16 +1164,15 @@
</span><span class="cx"> A8A473A5151A825B004123FF /* Deque.h in Headers */,
</span><span class="cx"> A8A473A6151A825B004123FF /* DisallowCType.h in Headers */,
</span><span class="cx"> A8A473AF151A825B004123FF /* diy-fp.h in Headers */,
</span><ins>+ 0F4570431BE5B58F0062A629 /* Dominators.h in Headers */,
</ins><span class="cx"> A8A473B1151A825B004123FF /* double-conversion.h in Headers */,
</span><span class="cx"> A8A473B2151A825B004123FF /* double.h in Headers */,
</span><span class="cx"> A8A473A7151A825B004123FF /* DoublyLinkedList.h in Headers */,
</span><span class="cx"> A8A473BB151A825B004123FF /* dtoa.h in Headers */,
</span><span class="cx"> A8A473C1151A825B004123FF /* ExportMacros.h in Headers */,
</span><del>- 1A944F471C3D8814005BD28C /* BlockPtr.h in Headers */,
</del><span class="cx"> A8A473B4151A825B004123FF /* fast-dtoa.h in Headers */,
</span><span class="cx"> 0FD81AC5154FB22E00983E72 /* FastBitVector.h in Headers */,
</span><span class="cx"> A8A473C4151A825B004123FF /* FastMalloc.h in Headers */,
</span><del>- 0F725CAC1C50461600AD943A /* RangeSet.h in Headers */,
</del><span class="cx"> B38FD7BD168953E80065C969 /* FeatureDefines.h in Headers */,
</span><span class="cx"> 0F9D3361165DBA73005AD387 /* FilePrintStream.h in Headers */,
</span><span class="cx"> A8A473B6151A825B004123FF /* fixed-dtoa.h in Headers */,
</span><span class="lines">@@ -1180,21 +1181,21 @@
</span><span class="cx"> A8A473C9151A825B004123FF /* Functional.h in Headers */,
</span><span class="cx"> 1A1D8B9C173186CE00141DA4 /* FunctionDispatcher.h in Headers */,
</span><span class="cx"> A8A473CA151A825B004123FF /* GetPtr.h in Headers */,
</span><ins>+ 0FEC84AF1BD825310080FF74 /* GraphNodeWorklist.h in Headers */,
</ins><span class="cx"> 2C05385415BC819000F21B96 /* GregorianDateTime.h in Headers */,
</span><span class="cx"> A8A473D3151A825B004123FF /* HashCountedSet.h in Headers */,
</span><span class="cx"> A8A4742D151A825B004123FF /* Hasher.h in Headers */,
</span><span class="cx"> A8A473D4151A825B004123FF /* HashFunctions.h in Headers */,
</span><span class="cx"> A8A473D5151A825B004123FF /* HashIterators.h in Headers */,
</span><span class="cx"> A8A473D6151A825B004123FF /* HashMap.h in Headers */,
</span><del>- 0FEB3DCF1BB5D684009D7AAD /* SharedTask.h in Headers */,
</del><span class="cx"> A8A473D7151A825B004123FF /* HashSet.h in Headers */,
</span><span class="cx"> A8A473D9151A825B004123FF /* HashTable.h in Headers */,
</span><span class="cx"> A8A473DA151A825B004123FF /* HashTraits.h in Headers */,
</span><span class="cx"> A8A473DB151A825B004123FF /* HexNumber.h in Headers */,
</span><ins>+ 2684D4361C000D400081D663 /* IndexSparseSet.h in Headers */,
</ins><span class="cx"> A8A473DC151A825B004123FF /* InlineASM.h in Headers */,
</span><span class="cx"> A70DA0841799F04D00529A9B /* Insertion.h in Headers */,
</span><span class="cx"> 26147B0A15DDCCDC00DDB907 /* IntegerToStringConversion.h in Headers */,
</span><del>- 0FB317C41C488001007E395A /* SystemTracing.h in Headers */,
</del><span class="cx"> 7CDD7FF8186D291E007433CD /* IteratorAdaptors.h in Headers */,
</span><span class="cx"> 7CDD7FFA186D2A54007433CD /* IteratorRange.h in Headers */,
</span><span class="cx"> 93AC91A818942FC400244939 /* LChar.h in Headers */,
</span><span class="lines">@@ -1208,7 +1209,6 @@
</span><span class="cx"> A8A473EA151A825B004123FF /* MD5.h in Headers */,
</span><span class="cx"> CD5497AD15857D0300B5BC30 /* MediaTime.h in Headers */,
</span><span class="cx"> A8A473EB151A825B004123FF /* MessageQueue.h in Headers */,
</span><del>- 0F9495841C571CC900413A48 /* OrderMaker.h in Headers */,
</del><span class="cx"> A8A473ED151A825B004123FF /* MetaAllocator.h in Headers */,
</span><span class="cx"> A8A473EE151A825B004123FF /* MetaAllocatorHandle.h in Headers */,
</span><span class="cx"> FE8225311B2A1E5B00BA68FD /* NakedPtr.h in Headers */,
</span><span class="lines">@@ -1218,27 +1218,31 @@
</span><span class="cx"> A8A473F5151A825B004123FF /* NumberOfCores.h in Headers */,
</span><span class="cx"> 7E29C33E15FFD79B00516D61 /* ObjcRuntimeExtras.h in Headers */,
</span><span class="cx"> 1AFDE6531953B23D00C48FFA /* Optional.h in Headers */,
</span><ins>+ 1A4656191C7FC68E00F5920F /* OptionSet.h in Headers */,
+ 0F9495841C571CC900413A48 /* OrderMaker.h in Headers */,
</ins><span class="cx"> A8A473F6151A825B004123FF /* OSAllocator.h in Headers */,
</span><span class="cx"> 7CBBA07419BB7FDC00BBF025 /* OSObjectPtr.h in Headers */,
</span><del>- 0F4570431BE5B58F0062A629 /* Dominators.h in Headers */,
</del><span class="cx"> A8A473FA151A825B004123FF /* OSRandomSource.h in Headers */,
</span><span class="cx"> A8A473FE151A825B004123FF /* PackedIntVector.h in Headers */,
</span><span class="cx"> A8A473FF151A825B004123FF /* PageAllocation.h in Headers */,
</span><span class="cx"> A8A47403151A825B004123FF /* PageBlock.h in Headers */,
</span><span class="cx"> A8A47404151A825B004123FF /* PageReservation.h in Headers */,
</span><ins>+ 0FFF19DD1BB334EB00886D91 /* ParallelHelperPool.h in Headers */,
</ins><span class="cx"> A8A47405151A825B004123FF /* ParallelJobs.h in Headers */,
</span><span class="cx"> A8A47408151A825B004123FF /* ParallelJobsLibdispatch.h in Headers */,
</span><ins>+ 0FEB3DD11BB7366B009D7AAD /* ParallelVectorIterator.h in Headers */,
</ins><span class="cx"> 0F824A691B7443A0002E345D /* ParkingLot.h in Headers */,
</span><span class="cx"> A8A4740C151A825B004123FF /* PassRefPtr.h in Headers */,
</span><span class="cx"> A876DBD8151816E500DADB95 /* Platform.h in Headers */,
</span><ins>+ 0FF860951BCCBD740045127F /* PointerComparison.h in Headers */,
</ins><span class="cx"> 0F9D3363165DBA73005AD387 /* PrintStream.h in Headers */,
</span><span class="cx"> 0FC4488316FE9FE100844BE9 /* ProcessID.h in Headers */,
</span><span class="cx"> 143F61201565F0F900DB514A /* RAMSize.h in Headers */,
</span><span class="cx"> A8A47415151A825B004123FF /* RandomNumber.h in Headers */,
</span><span class="cx"> A8A47416151A825B004123FF /* RandomNumberSeed.h in Headers */,
</span><ins>+ 0F725CAC1C50461600AD943A /* RangeSet.h in Headers */,
</ins><span class="cx"> 0F87105A16643F190090B0AD /* RawPointer.h in Headers */,
</span><span class="cx"> A8A47417151A825B004123FF /* RedBlackTree.h in Headers */,
</span><del>- 553071CA1C40427200384898 /* TinyLRUCache.h in Headers */,
</del><span class="cx"> 26299B6E17A9E5B800ADEBE5 /* Ref.h in Headers */,
</span><span class="cx"> A8A47418151A825B004123FF /* RefCounted.h in Headers */,
</span><span class="cx"> A8A47419151A825B004123FF /* RefCountedArray.h in Headers */,
</span><span class="lines">@@ -1248,29 +1252,29 @@
</span><span class="cx"> A8A4741E151A825B004123FF /* RetainPtr.h in Headers */,
</span><span class="cx"> 2CDED0F418115C85004DBA70 /* RunLoop.h in Headers */,
</span><span class="cx"> 1469419216EAAF6D0024E146 /* RunLoopTimer.h in Headers */,
</span><ins>+ A5098B001C169E0700087797 /* SandboxSPI.h in Headers */,
</ins><span class="cx"> 14F3B0F715E45E4600210069 /* SaturatedArithmetic.h in Headers */,
</span><span class="cx"> 1469419616EAAFF80024E146 /* SchedulePair.h in Headers */,
</span><ins>+ 0FEC84B11BDACD390080FF74 /* ScopedLambda.h in Headers */,
+ A5098B021C16A4F900087797 /* SecuritySPI.h in Headers */,
</ins><span class="cx"> A8A4741F151A825B004123FF /* SegmentedVector.h in Headers */,
</span><span class="cx"> A8A47420151A825B004123FF /* SentinelLinkedList.h in Headers */,
</span><span class="cx"> A8A47422151A825B004123FF /* SHA1.h in Headers */,
</span><ins>+ 0FEB3DCF1BB5D684009D7AAD /* SharedTask.h in Headers */,
</ins><span class="cx"> A8A47423151A825B004123FF /* SimpleStats.h in Headers */,
</span><del>- 0FF860951BCCBD740045127F /* PointerComparison.h in Headers */,
</del><span class="cx"> A8A47424151A825B004123FF /* SinglyLinkedList.h in Headers */,
</span><span class="cx"> A748745317A0BDAE00FA04CB /* SixCharacterHash.h in Headers */,
</span><span class="cx"> A8A47426151A825B004123FF /* Spectrum.h in Headers */,
</span><span class="cx"> A8A47428151A825B004123FF /* StackBounds.h in Headers */,
</span><del>- 2684D4361C000D400081D663 /* IndexSparseSet.h in Headers */,
</del><span class="cx"> FEDACD3E1630F83F00C69634 /* StackStats.h in Headers */,
</span><span class="cx"> A8A47429151A825B004123FF /* StaticConstructors.h in Headers */,
</span><span class="cx"> A8A4742A151A825B004123FF /* StdLibExtras.h in Headers */,
</span><del>- 0F4570451BE834410062A629 /* BubbleSort.h in Headers */,
</del><span class="cx"> C4F8A93719C65EB400B2B15D /* Stopwatch.h in Headers */,
</span><span class="cx"> 1A6BB769162F300500DD16DB /* StreamBuffer.h in Headers */,
</span><span class="cx"> A8A4743B151A825B004123FF /* StringBuffer.h in Headers */,
</span><span class="cx"> A8A4743D151A825B004123FF /* StringBuilder.h in Headers */,
</span><span class="cx"> 430B47891AAAAC1A001223DA /* StringCommon.h in Headers */,
</span><span class="cx"> A8A4743E151A825B004123FF /* StringConcatenate.h in Headers */,
</span><del>- 0F93274B1C17F4B700CF6564 /* Box.h in Headers */,
</del><span class="cx"> A8A4742C151A825B004123FF /* StringExtras.h in Headers */,
</span><span class="cx"> A8A4743F151A825B004123FF /* StringHash.h in Headers */,
</span><span class="cx"> A748745417A0BDAE00FA04CB /* StringHashDumpContext.h in Headers */,
</span><span class="lines">@@ -1281,30 +1285,30 @@
</span><span class="cx"> A8A473B8151A825B004123FF /* strtod.h in Headers */,
</span><span class="cx"> 70ECA60E1B02426800449739 /* SymbolImpl.h in Headers */,
</span><span class="cx"> 70A993FF1AD7151300FA615B /* SymbolRegistry.h in Headers */,
</span><ins>+ 0FB317C41C488001007E395A /* SystemTracing.h in Headers */,
</ins><span class="cx"> A8A47433151A825B004123FF /* TemporaryChange.h in Headers */,
</span><span class="cx"> A8A47444151A825B004123FF /* TextPosition.h in Headers */,
</span><span class="cx"> A8A47447151A825B004123FF /* ThreadFunctionInvocation.h in Headers */,
</span><span class="cx"> A8A47449151A825B004123FF /* ThreadIdentifierDataPthreads.h in Headers */,
</span><span class="cx"> A8A4744B151A825B004123FF /* Threading.h in Headers */,
</span><span class="cx"> A8A4744D151A825B004123FF /* ThreadingPrimitives.h in Headers */,
</span><del>- 0FEC84B11BDACD390080FF74 /* ScopedLambda.h in Headers */,
</del><span class="cx"> A8A47454151A825B004123FF /* ThreadSafeRefCounted.h in Headers */,
</span><span class="cx"> A8A47455151A825B004123FF /* ThreadSpecific.h in Headers */,
</span><ins>+ 553071CA1C40427200384898 /* TinyLRUCache.h in Headers */,
</ins><span class="cx"> 0FED67B61B22D4D80066CE15 /* TinyPtrSet.h in Headers */,
</span><span class="cx"> 149EF16316BBFE0D000A4331 /* TriState.h in Headers */,
</span><span class="cx"> 83FBA93219DF459700F30ADB /* TypeCasts.h in Headers */,
</span><span class="cx"> 1AFDE648195201C300C48FFA /* TypeCastsCF.h in Headers */,
</span><span class="cx"> A8A4746D151A825B004123FF /* UnionFind.h in Headers */,
</span><span class="cx"> 70ECA60F1B02426800449739 /* UniquedStringImpl.h in Headers */,
</span><del>- 0FEC84AF1BD825310080FF74 /* GraphNodeWorklist.h in Headers */,
</del><span class="cx"> A8A4746A151A825B004123FF /* UTF8.h in Headers */,
</span><span class="cx"> A8A473B9151A825B004123FF /* utils.h in Headers */,
</span><span class="cx"> A8A4747D151A825B004123FF /* ValueCheck.h in Headers */,
</span><span class="cx"> A8A4747E151A825B004123FF /* Vector.h in Headers */,
</span><span class="cx"> A8A4747F151A825B004123FF /* VectorTraits.h in Headers */,
</span><del>- A5098B001C169E0700087797 /* SandboxSPI.h in Headers */,
</del><span class="cx"> A8A47480151A825B004123FF /* VMTags.h in Headers */,
</span><span class="cx"> 974CFC8E16A4F327006D5404 /* WeakPtr.h in Headers */,
</span><ins>+ 0F3501641BB258D500F0A2A3 /* WeakRandom.h in Headers */,
</ins><span class="cx"> 1FA47C8B152502DA00568D1B /* WebCoreThread.h in Headers */,
</span><span class="cx"> 0FE4479D1B7AAA03009498EB /* WordLock.h in Headers */,
</span><span class="cx"> E4A0AD3A1A96245500536DF6 /* WorkQueue.h in Headers */,
</span><span class="lines">@@ -1455,6 +1459,7 @@
</span><span class="cx"> A8A473F7151A825B004123FF /* OSAllocatorPosix.cpp in Sources */,
</span><span class="cx"> A8A473F9151A825B004123FF /* OSRandomSource.cpp in Sources */,
</span><span class="cx"> A8A47402151A825B004123FF /* PageBlock.cpp in Sources */,
</span><ins>+ 0FFF19DC1BB334EB00886D91 /* ParallelHelperPool.cpp in Sources */,
</ins><span class="cx"> 0F824A681B7443A0002E345D /* ParkingLot.cpp in Sources */,
</span><span class="cx"> 0F9D3362165DBA73005AD387 /* PrintStream.cpp in Sources */,
</span><span class="cx"> 143F611F1565F0F900DB514A /* RAMSize.cpp in Sources */,
</span><span class="lines">@@ -1463,7 +1468,6 @@
</span><span class="cx"> 2CDED0F318115C85004DBA70 /* RunLoop.cpp in Sources */,
</span><span class="cx"> 2CDED0EF18115C38004DBA70 /* RunLoopCF.cpp in Sources */,
</span><span class="cx"> 1469419316EAAF6D0024E146 /* RunLoopTimerCF.cpp in Sources */,
</span><del>- 0FFF19DC1BB334EB00886D91 /* ParallelHelperPool.cpp in Sources */,
</del><span class="cx"> 1469419916EAB0410024E146 /* SchedulePairCF.cpp in Sources */,
</span><span class="cx"> 1469419716EAAFF80024E146 /* SchedulePairMac.mm in Sources */,
</span><span class="cx"> A8A47421151A825B004123FF /* SHA1.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfForwardh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Forward.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Forward.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WTF/wtf/Forward.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -28,10 +28,11 @@
</span><span class="cx"> template<typename T> class Function;
</span><span class="cx"> template<typename T> class LazyNeverDestroyed;
</span><span class="cx"> template<typename T> class NeverDestroyed;
</span><ins>+template<typename T> class OptionSet;
</ins><span class="cx"> template<typename T> class Optional;
</span><span class="cx"> template<typename T> class PassRefPtr;
</span><ins>+template<typename T> class Ref;
</ins><span class="cx"> template<typename T> class RefPtr;
</span><del>-template<typename T> class Ref;
</del><span class="cx"> template<typename T> class StringBuffer;
</span><span class="cx">
</span><span class="cx"> template<typename T, size_t inlineCapacity, typename OverflowHandler, size_t minCapacity> class Vector;
</span><span class="lines">@@ -63,6 +64,7 @@
</span><span class="cx"> using WTF::FunctionDispatcher;
</span><span class="cx"> using WTF::LazyNeverDestroyed;
</span><span class="cx"> using WTF::NeverDestroyed;
</span><ins>+using WTF::OptionSet;
</ins><span class="cx"> using WTF::Optional;
</span><span class="cx"> using WTF::OrdinalNumber;
</span><span class="cx"> using WTF::PassRefPtr;
</span></span></pre></div>
<a id="trunkSourceWTFwtfOptionSethfromrev197188trunkSourceWebKit2SharedWebsiteDataWebsiteDatah"></a>
<div class="copfile"><h4>Copied: trunk/Source/WTF/wtf/OptionSet.h (from rev 197188, trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h) (0 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/OptionSet.h (rev 0)
+++ trunk/Source/WTF/wtf/OptionSet.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef OptionSet_h
+#define OptionSet_h
+
+#include <type_traits>
+
+namespace WTF {
+
+template<typename T> class OptionSet {
+ static_assert(std::is_enum<T>::value, "T is not an enum type");
+ typedef typename std::make_unsigned<typename std::underlying_type<T>::type>::type StorageType;
+
+public:
+ static OptionSet fromRaw(StorageType storageType)
+ {
+ return static_cast<T>(storageType);
+ }
+
+ constexpr OptionSet()
+ : m_storage(0)
+ {
+ }
+
+ constexpr OptionSet(T t)
+ : m_storage(static_cast<StorageType>(t))
+ {
+ }
+
+ constexpr StorageType toRaw() const { return m_storage; }
+
+ constexpr bool contains(OptionSet optionSet) const
+ {
+ return m_storage & optionSet.m_storage;
+ }
+
+ friend OptionSet& operator|=(OptionSet& lhs, OptionSet rhs)
+ {
+ lhs.m_storage |= rhs.m_storage;
+
+ return lhs;
+ }
+
+private:
+ StorageType m_storage;
+};
+
+}
+
+using WTF::OptionSet;
+
+#endif // OptionSet_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -1,3 +1,81 @@
</span><ins>+2016-02-26 Anders Carlsson <andersca@apple.com>
+
+ Add WTF::OptionSet and use it for the website data types enum
+ https://bugs.webkit.org/show_bug.cgi?id=154733
+
+ Reviewed by Geoffrey Garen.
+
+ This is a pretty mechanical change:
+
+ Convert all uses of the WebsiteDataTypes enum to WTF::OptionSet. Rename the WebsiteDataTypes enum to
+ WebsiteDataType (since it only represents a single data type), and rename headers. Encode and decode WTF::OptionSet properly.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::fetchWebsiteData):
+ (WebKit::DatabaseProcess::deleteWebsiteData):
+ (WebKit::DatabaseProcess::deleteWebsiteDataForOrigins):
+ * DatabaseProcess/DatabaseProcess.h:
+ * DatabaseProcess/DatabaseProcess.messages.in:
+ * NetworkProcess/NetworkProcess.cpp:
+ (WebKit::fetchDiskCacheEntries):
+ (WebKit::NetworkProcess::fetchWebsiteData):
+ (WebKit::NetworkProcess::deleteWebsiteData):
+ (WebKit::NetworkProcess::deleteWebsiteDataForOrigins):
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * Platform/IPC/ArgumentCoders.h:
+ (IPC::ArgumentCoder<OptionSet<T>>::encode):
+ (IPC::ArgumentCoder<OptionSet<T>>::decode):
+ * Scripts/webkit/messages.py:
+ (class_template_headers):
+ * Shared/WebsiteData/WebsiteData.h:
+ * Shared/WebsiteData/WebsiteDataType.h: Renamed from Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h.
+ * UIProcess/API/C/WKApplicationCacheManager.cpp:
+ (WKApplicationCacheManagerGetApplicationCacheOrigins):
+ (WKApplicationCacheManagerDeleteEntriesForOrigin):
+ (WKApplicationCacheManagerDeleteAllEntries):
+ * UIProcess/API/C/WKResourceCacheManager.cpp:
+ (toWebsiteDataTypes):
+ (WKResourceCacheManagerClearCacheForOrigin):
+ * UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h:
+ (WebKit::toWebsiteDataTypes):
+ (WebKit::toWKWebsiteDataTypes):
+ * UIProcess/Databases/DatabaseProcessProxy.cpp:
+ (WebKit::DatabaseProcessProxy::fetchWebsiteData):
+ (WebKit::DatabaseProcessProxy::deleteWebsiteData):
+ (WebKit::DatabaseProcessProxy::deleteWebsiteDataForOrigins):
+ * UIProcess/Databases/DatabaseProcessProxy.h:
+ * UIProcess/Network/NetworkProcessProxy.cpp:
+ (WebKit::NetworkProcessProxy::fetchWebsiteData):
+ (WebKit::NetworkProcessProxy::deleteWebsiteData):
+ (WebKit::NetworkProcessProxy::deleteWebsiteDataForOrigins):
+ * UIProcess/Network/NetworkProcessProxy.h:
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::fetchWebsiteData):
+ (WebKit::WebProcessProxy::deleteWebsiteData):
+ (WebKit::WebProcessProxy::deleteWebsiteDataForOrigins):
+ * UIProcess/WebProcessProxy.h:
+ * UIProcess/WebsiteData/WebsiteDataRecord.cpp:
+ (WebKit::WebsiteDataRecord::add):
+ (WebKit::WebsiteDataRecord::addCookieHostName):
+ (WebKit::WebsiteDataRecord::addPluginDataHostName):
+ * UIProcess/WebsiteData/WebsiteDataRecord.h:
+ * UIProcess/WebsiteData/WebsiteDataStore.cpp:
+ (WebKit::computeNetworkProcessAccessTypeForDataFetch):
+ (WebKit::computeWebProcessAccessTypeForDataFetch):
+ (WebKit::WebsiteDataStore::fetchData):
+ (WebKit::computeNetworkProcessAccessTypeForDataRemoval):
+ (WebKit::computeWebProcessAccessTypeForDataRemoval):
+ (WebKit::WebsiteDataStore::removeData):
+ * UIProcess/WebsiteData/WebsiteDataStore.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::fetchWebsiteData):
+ (WebKit::WebProcess::deleteWebsiteData):
+ (WebKit::WebProcess::deleteWebsiteDataForOrigins):
+ * WebProcess/WebProcess.h:
+ * WebProcess/WebProcess.messages.in:
+
</ins><span class="cx"> 2016-02-26 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Try to fix the Yosemite build again.
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseProcess::fetchWebsiteData(SessionID, uint64_t websiteDataTypes, uint64_t callbackID)
</del><ins>+void DatabaseProcess::fetchWebsiteData(SessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> struct CallbackAggregator final : public ThreadSafeRefCounted<CallbackAggregator> {
</span><span class="cx"> explicit CallbackAggregator(std::function<void (WebsiteData)> completionHandler)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> }));
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><del>- if (websiteDataTypes & WebsiteDataTypeIndexedDBDatabases) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases)) {
</ins><span class="cx"> // FIXME: Pick the right database store based on the session ID.
</span><span class="cx"> postDatabaseTask(std::make_unique<CrossThreadTask>([callbackAggregator, websiteDataTypes, this] {
</span><span class="cx">
</span><span class="lines">@@ -228,14 +228,14 @@
</span><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator, securityOrigins] {
</span><span class="cx"> for (const auto& securityOrigin : securityOrigins)
</span><del>- callbackAggregator->m_websiteData.entries.append(WebsiteData::Entry { securityOrigin, WebsiteDataTypeIndexedDBDatabases });
</del><ins>+ callbackAggregator->m_websiteData.entries.append(WebsiteData::Entry { securityOrigin, WebsiteDataType::IndexedDBDatabases });
</ins><span class="cx"> });
</span><span class="cx"> }));
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseProcess::deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</del><ins>+void DatabaseProcess::deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> struct CallbackAggregator final : public ThreadSafeRefCounted<CallbackAggregator> {
</span><span class="cx"> explicit CallbackAggregator(std::function<void ()> completionHandler)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> }));
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><del>- if (websiteDataTypes & WebsiteDataTypeIndexedDBDatabases) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases)) {
</ins><span class="cx"> postDatabaseTask(std::make_unique<CrossThreadTask>([this, callbackAggregator, modifiedSince] {
</span><span class="cx">
</span><span class="cx"> deleteIndexedDatabaseEntriesModifiedSince(modifiedSince);
</span><span class="lines">@@ -268,7 +268,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseProcess::deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& securityOriginDatas, uint64_t callbackID)
</del><ins>+void DatabaseProcess::deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<SecurityOriginData>& securityOriginDatas, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> struct CallbackAggregator final : public ThreadSafeRefCounted<CallbackAggregator> {
</span><span class="cx"> explicit CallbackAggregator(std::function<void ()> completionHandler)
</span><span class="lines">@@ -291,7 +291,7 @@
</span><span class="cx"> }));
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><del>- if (websiteDataTypes & WebsiteDataTypeIndexedDBDatabases) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases)) {
</ins><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> securityOrigins;
</span><span class="cx"> for (const auto& securityOriginData : securityOriginDatas)
</span><span class="cx"> securityOrigins.append(securityOriginData.securityOrigin());
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class DatabaseToWebProcessConnection;
</span><del>-
</del><ins>+enum class WebsiteDataType;
</ins><span class="cx"> struct DatabaseProcessCreationParameters;
</span><span class="cx">
</span><span class="cx"> class DatabaseProcess : public ChildProcess {
</span><span class="lines">@@ -87,9 +87,9 @@
</span><span class="cx"> void initializeDatabaseProcess(const DatabaseProcessCreationParameters&);
</span><span class="cx"> void createDatabaseToWebProcessConnection();
</span><span class="cx">
</span><del>- void fetchWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, uint64_t callbackID);
- void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
- void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<WebCore::SecurityOriginData>& origins, uint64_t callbackID);
</del><ins>+ void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID);
+ void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
+ void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<WebCore::SecurityOriginData>& origins, uint64_t callbackID);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> indexedDatabaseOrigins();
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.messages.in 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -29,9 +29,9 @@
</span><span class="cx"> # Creates a connection for communication with a WebProcess
</span><span class="cx"> CreateDatabaseToWebProcessConnection()
</span><span class="cx">
</span><del>- FetchWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, uint64_t callbackID)
- DeleteWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
- DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, uint64_t callbackID)
</del><ins>+ FetchWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, uint64_t callbackID)
+ DeleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
+ DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, uint64_t callbackID)
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(DATABASE_PROCESS)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.cpp 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebProcessPoolMessages.h"
</span><span class="cx"> #include "WebsiteData.h"
</span><ins>+#include "WebsiteDataType.h"
</ins><span class="cx"> #include <WebCore/DNS.h>
</span><span class="cx"> #include <WebCore/DiagnosticLoggingClient.h>
</span><span class="cx"> #include <WebCore/Logging.h>
</span><span class="lines">@@ -54,6 +55,7 @@
</span><span class="cx"> #include <WebCore/SecurityOriginData.h>
</span><span class="cx"> #include <WebCore/SecurityOriginHash.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><ins>+#include <wtf/OptionSet.h>
</ins><span class="cx"> #include <wtf/RunLoop.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="lines">@@ -290,7 +292,7 @@
</span><span class="cx"> Vector<WebsiteData::Entry> entries;
</span><span class="cx">
</span><span class="cx"> for (auto& origin : *origins)
</span><del>- entries.append(WebsiteData::Entry { origin, WebsiteDataTypeDiskCache });
</del><ins>+ entries.append(WebsiteData::Entry { origin, WebsiteDataType::DiskCache });
</ins><span class="cx">
</span><span class="cx"> delete origins;
</span><span class="cx">
</span><span class="lines">@@ -312,7 +314,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CFURLCACHE)
</span><span class="cx"> for (auto& origin : NetworkProcess::cfURLCacheOrigins())
</span><del>- entries.append(WebsiteData::Entry { WTFMove(origin), WebsiteDataTypeDiskCache });
</del><ins>+ entries.append(WebsiteData::Entry { WTFMove(origin), WebsiteDataType::DiskCache });
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RunLoop::main().dispatch([completionHandler, entries] {
</span><span class="lines">@@ -320,7 +322,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::fetchWebsiteData(SessionID sessionID, uint64_t websiteDataTypes, uint64_t callbackID)
</del><ins>+void NetworkProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> struct CallbackAggregator final : public RefCounted<CallbackAggregator> {
</span><span class="cx"> explicit CallbackAggregator(std::function<void (WebsiteData)> completionHandler)
</span><span class="lines">@@ -348,28 +350,28 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::NetworkProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0);
</span><span class="cx"> }));
</span><span class="cx">
</span><del>- if (websiteDataTypes & WebsiteDataTypeCookies) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::Cookies)) {
</ins><span class="cx"> if (auto* networkStorageSession = SessionTracker::storageSession(sessionID))
</span><span class="cx"> getHostnamesWithCookies(*networkStorageSession, callbackAggregator->m_websiteData.hostNamesWithCookies);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (websiteDataTypes & WebsiteDataTypeDiskCache) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::DiskCache)) {
</ins><span class="cx"> fetchDiskCacheEntries(sessionID, [callbackAggregator](Vector<WebsiteData::Entry> entries) {
</span><span class="cx"> callbackAggregator->m_websiteData.entries.appendVector(entries);
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::deleteWebsiteData(SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</del><ins>+void NetworkProcess::deleteWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> #if PLATFORM(COCOA)
</span><del>- if (websiteDataTypes & WebsiteDataTypeHSTSCache) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::HSTSCache)) {
</ins><span class="cx"> if (auto* networkStorageSession = SessionTracker::storageSession(sessionID))
</span><span class="cx"> clearHSTSCache(*networkStorageSession, modifiedSince);
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (websiteDataTypes & WebsiteDataTypeCookies) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::Cookies)) {
</ins><span class="cx"> if (auto* networkStorageSession = SessionTracker::storageSession(sessionID))
</span><span class="cx"> deleteAllCookiesModifiedSince(*networkStorageSession, modifiedSince);
</span><span class="cx"> }
</span><span class="lines">@@ -378,7 +380,7 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::NetworkProcessProxy::DidDeleteWebsiteData(callbackID), 0);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- if ((websiteDataTypes & WebsiteDataTypeDiskCache) && !sessionID.isEphemeral()) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::DiskCache) && !sessionID.isEphemeral()) {
</ins><span class="cx"> clearDiskCache(modifiedSince, WTFMove(completionHandler));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -427,9 +429,9 @@
</span><span class="cx"> RunLoop::main().dispatch(WTFMove(completionHandler));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcess::deleteWebsiteDataForOrigins(SessionID sessionID, uint64_t websiteDataTypes, const Vector<SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID)
</del><ins>+void NetworkProcess::deleteWebsiteDataForOrigins(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID)
</ins><span class="cx"> {
</span><del>- if (websiteDataTypes & WebsiteDataTypeCookies) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::Cookies)) {
</ins><span class="cx"> if (auto* networkStorageSession = SessionTracker::storageSession(sessionID))
</span><span class="cx"> deleteCookiesForHostnames(*networkStorageSession, cookieHostNames);
</span><span class="cx"> }
</span><span class="lines">@@ -438,7 +440,7 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::NetworkProcessProxy::DidDeleteWebsiteDataForOrigins(callbackID), 0);
</span><span class="cx"> };
</span><span class="cx">
</span><del>- if ((websiteDataTypes & WebsiteDataTypeDiskCache) && !sessionID.isEphemeral()) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::DiskCache) && !sessionID.isEphemeral()) {
</ins><span class="cx"> clearDiskCacheEntries(origins, WTFMove(completionHandler));
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> class AuthenticationManager;
</span><span class="cx"> class NetworkConnectionToWebProcess;
</span><span class="cx"> class NetworkProcessSupplement;
</span><ins>+enum class WebsiteDataType;
</ins><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx">
</span><span class="cx"> class NetworkProcess : public ChildProcess, private DownloadManager::Client {
</span><span class="lines">@@ -150,9 +151,9 @@
</span><span class="cx"> void ensurePrivateBrowsingSession(WebCore::SessionID);
</span><span class="cx"> void destroyPrivateBrowsingSession(WebCore::SessionID);
</span><span class="cx">
</span><del>- void fetchWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, uint64_t callbackID);
- void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
- void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID);
</del><ins>+ void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, uint64_t callbackID);
+ void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
+ void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>& origins, const Vector<String>& cookieHostNames, uint64_t callbackID);
</ins><span class="cx">
</span><span class="cx"> void clearCachedCredentials();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkProcess.messages.in 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -37,9 +37,9 @@
</span><span class="cx"> EnsurePrivateBrowsingSession(WebCore::SessionID sessionID)
</span><span class="cx"> DestroyPrivateBrowsingSession(WebCore::SessionID sessionID)
</span><span class="cx">
</span><del>- FetchWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, uint64_t callbackID)
- DeleteWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
- DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, Vector<String> cookieHostNames, uint64_t callbackID)
</del><ins>+ FetchWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, uint64_t callbackID)
+ DeleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
+ DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, Vector<String> cookieHostNames, uint64_t callbackID)
</ins><span class="cx">
</span><span class="cx"> DownloadRequest(WebCore::SessionID sessionID, WebKit::DownloadID downloadID, WebCore::ResourceRequest request)
</span><span class="cx"> ResumeDownload(WebCore::SessionID sessionID, WebKit::DownloadID downloadID, IPC::DataReference resumeData, String path, WebKit::SandboxExtension::Handle sandboxExtensionHandle)
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><ins>+#include <wtf/OptionSet.h>
</ins><span class="cx"> #include <wtf/Optional.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="lines">@@ -54,6 +55,23 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<typename T> struct ArgumentCoder<OptionSet<T>> {
+ static void encode(ArgumentEncoder& encoder, const OptionSet<T>& optionSet)
+ {
+ encoder << (static_cast<uint64_t>(optionSet.toRaw()));
+ }
+
+ static bool decode(ArgumentDecoder& decoder, OptionSet<T>& optionSet)
+ {
+ uint64_t value;
+ if (!decoder.decode(value))
+ return false;
+
+ optionSet = OptionSet<T>::fromRaw(value);
+ return true;
+ }
+};
+
</ins><span class="cx"> template<typename T> struct ArgumentCoder<WTF::Optional<T>> {
</span><span class="cx"> static void encode(ArgumentEncoder& encoder, const WTF::Optional<T>& optional)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/messages.py 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/Scripts/webkit/messages.py 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -296,6 +296,7 @@
</span><span class="cx"> class_template_types = {
</span><span class="cx"> 'HashMap': {'headers': ['<wtf/HashMap.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</span><span class="cx"> 'Optional': {'headers': ['<wtf/Optional.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</span><ins>+ 'OptionSet': {'headers': ['<wtf/OptionSet.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</ins><span class="cx"> 'Vector': {'headers': ['<wtf/Vector.h>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</span><span class="cx"> 'std::pair': {'headers': ['<utility>'], 'argument_coder_headers': ['"ArgumentCoders.h"']},
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteData.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #ifndef WebsiteData_h
</span><span class="cx"> #define WebsiteData_h
</span><span class="cx">
</span><del>-#include "WebsiteDataTypes.h"
</del><span class="cx"> #include <WebCore/SecurityOrigin.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -38,10 +37,12 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+enum class WebsiteDataType;
+
</ins><span class="cx"> struct WebsiteData {
</span><span class="cx"> struct Entry {
</span><span class="cx"> RefPtr<WebCore::SecurityOrigin> origin;
</span><del>- WebsiteDataTypes type;
</del><ins>+ WebsiteDataType type;
</ins><span class="cx">
</span><span class="cx"> void encode(IPC::ArgumentEncoder&) const;
</span><span class="cx"> static bool decode(IPC::ArgumentDecoder&, WebsiteData::Entry&);
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypehfromrev197188trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataType.h (from rev 197188, trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h) (0 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataType.h (rev 0)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataType.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebsiteDataType_h
+#define WebsiteDataType_h
+
+namespace WebKit {
+
+enum class WebsiteDataType {
+ Cookies = 1 << 0,
+ DiskCache = 1 << 1,
+ MemoryCache = 1 << 2,
+ OfflineWebApplicationCache = 1 << 3,
+ SessionStorage = 1 << 4,
+ LocalStorage = 1 << 5,
+ WebSQLDatabases = 1 << 6,
+ IndexedDBDatabases = 1 << 7,
+ MediaKeys = 1 << 8,
+ HSTSCache = 1 << 9,
+ SearchFieldRecentSearches = 1 << 10,
+#if ENABLE(NETSCAPE_PLUGIN_API)
+ PlugInData = 1 << 11,
+#endif
+#if ENABLE(MEDIA_STREAM)
+ MediaDeviceIdentifier = 1 << 12,
+#endif
+};
+
+};
+
+#endif // WebsiteDataType_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebsiteDataWebsiteDataTypesh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/Shared/WebsiteData/WebsiteDataTypes.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -1,53 +0,0 @@
</span><del>-/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WebsiteDataTypes_h
-#define WebsiteDataTypes_h
-
-namespace WebKit {
-
-enum WebsiteDataTypes {
- WebsiteDataTypeCookies = 1 << 0,
- WebsiteDataTypeDiskCache = 1 << 1,
- WebsiteDataTypeMemoryCache = 1 << 2,
- WebsiteDataTypeOfflineWebApplicationCache = 1 << 3,
- WebsiteDataTypeSessionStorage = 1 << 4,
- WebsiteDataTypeLocalStorage = 1 << 5,
- WebsiteDataTypeWebSQLDatabases = 1 << 6,
- WebsiteDataTypeIndexedDBDatabases = 1 << 7,
- WebsiteDataTypeMediaKeys = 1 << 8,
- WebsiteDataTypeHSTSCache = 1 << 9,
- WebsiteDataTypeSearchFieldRecentSearches = 1 << 10,
-#if ENABLE(NETSCAPE_PLUGIN_API)
- WebsiteDataTypePlugInData = 1 << 11,
-#endif
-#if ENABLE(MEDIA_STREAM)
- WebsiteDataTypeMediaDeviceIdentifier = 1 << 12,
-#endif
-};
-
-};
-
-#endif // WebsiteDataTypes_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKApplicationCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKApplicationCacheManager.cpp 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> void WKApplicationCacheManagerGetApplicationCacheOrigins(WKApplicationCacheManagerRef applicationCacheManager, void* context, WKApplicationCacheManagerGetApplicationCacheOriginsFunction callback)
</span><span class="cx"> {
</span><span class="cx"> auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();
</span><del>- websiteDataStore.fetchData(WebsiteDataTypes::WebsiteDataTypeOfflineWebApplicationCache, [context, callback](Vector<WebsiteDataRecord> dataRecords) {
</del><ins>+ websiteDataStore.fetchData(WebsiteDataType::OfflineWebApplicationCache, [context, callback](Vector<WebsiteDataRecord> dataRecords) {
</ins><span class="cx"> Vector<RefPtr<API::Object>> securityOrigins;
</span><span class="cx"> for (const auto& dataRecord : dataRecords) {
</span><span class="cx"> for (const auto& origin : dataRecord.origins)
</span><span class="lines">@@ -56,13 +56,13 @@
</span><span class="cx"> auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();
</span><span class="cx">
</span><span class="cx"> WebsiteDataRecord dataRecord;
</span><del>- dataRecord.add(WebsiteDataTypes::WebsiteDataTypeOfflineWebApplicationCache, &toImpl(origin)->securityOrigin());
</del><ins>+ dataRecord.add(WebsiteDataType::OfflineWebApplicationCache, &toImpl(origin)->securityOrigin());
</ins><span class="cx">
</span><del>- websiteDataStore.removeData(WebsiteDataTypes::WebsiteDataTypeOfflineWebApplicationCache, { dataRecord }, [] { });
</del><ins>+ websiteDataStore.removeData(WebsiteDataType::OfflineWebApplicationCache, { dataRecord }, [] { });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKApplicationCacheManagerDeleteAllEntries(WKApplicationCacheManagerRef applicationCacheManager)
</span><span class="cx"> {
</span><span class="cx"> auto& websiteDataStore = toImpl(reinterpret_cast<WKWebsiteDataStoreRef>(applicationCacheManager))->websiteDataStore();
</span><del>- websiteDataStore.removeData(WebsiteDataTypes::WebsiteDataTypeOfflineWebApplicationCache, std::chrono::system_clock::time_point::min(), [] { });
</del><ins>+ websiteDataStore.removeData(WebsiteDataType::OfflineWebApplicationCache, std::chrono::system_clock::time_point::min(), [] { });
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKResourceCacheManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -37,16 +37,16 @@
</span><span class="cx"> return toAPI(API::WebsiteDataStore::APIType);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static WebsiteDataTypes toWebsiteDataTypes(WKResourceCachesToClear cachesToClear)
</del><ins>+static OptionSet<WebsiteDataType> toWebsiteDataTypes(WKResourceCachesToClear cachesToClear)
</ins><span class="cx"> {
</span><del>- using WebsiteDataTypes = WebKit::WebsiteDataTypes;
</del><ins>+ OptionSet<WebsiteDataType> websiteDataTypes;
</ins><span class="cx">
</span><del>- int websiteDataTypes = WebsiteDataTypeMemoryCache;
</del><ins>+ websiteDataTypes |= WebsiteDataType::MemoryCache;
</ins><span class="cx">
</span><span class="cx"> if (cachesToClear == WKResourceCachesToClearAll)
</span><del>- websiteDataTypes |= WebsiteDataTypeDiskCache;
</del><ins>+ websiteDataTypes |= WebsiteDataType::DiskCache;
</ins><span class="cx">
</span><del>- return static_cast<WebsiteDataTypes>(websiteDataTypes);
</del><ins>+ return websiteDataTypes;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef cacheManager, void* context, WKResourceCacheManagerGetCacheOriginsFunction callback)
</span><span class="lines">@@ -71,14 +71,14 @@
</span><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> WebsiteDataRecord dataRecord;
</span><del>- dataRecord.add(WebsiteDataTypes::WebsiteDataTypeMemoryCache, &toImpl(origin)->securityOrigin());
</del><ins>+ dataRecord.add(WebsiteDataType::MemoryCache, &toImpl(origin)->securityOrigin());
</ins><span class="cx">
</span><span class="cx"> dataRecords.append(dataRecord);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (cachesToClear == WKResourceCachesToClearAll) {
</span><span class="cx"> WebsiteDataRecord dataRecord;
</span><del>- dataRecord.add(WebsiteDataTypes::WebsiteDataTypeDiskCache, &toImpl(origin)->securityOrigin());
</del><ins>+ dataRecord.add(WebsiteDataType::DiskCache, &toImpl(origin)->securityOrigin());
</ins><span class="cx">
</span><span class="cx"> dataRecords.append(dataRecord);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebsiteDataRecordInternalh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebsiteDataRecordInternal.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx">
</span><span class="cx"> #import "APIWebsiteDataRecord.h"
</span><span class="cx"> #import "WKObject.h"
</span><ins>+#import <wtf/OptionSet.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="lines">@@ -38,71 +39,72 @@
</span><span class="cx"> return (WKWebsiteDataRecord *)websiteDataRecord.wrapper();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline WebKit::WebsiteDataTypes toWebsiteDataTypes(NSSet *wkWebsiteDataTypes)
</del><ins>+static inline OptionSet<WebKit::WebsiteDataType> toWebsiteDataTypes(NSSet *wkWebsiteDataTypes)
</ins><span class="cx"> {
</span><del>- using WebsiteDataTypes = WebKit::WebsiteDataTypes;
</del><ins>+ using WebsiteDataType = WebKit::WebsiteDataType;
</ins><span class="cx">
</span><del>- int websiteDataTypes = 0;
</del><ins>+ OptionSet<WebKit::WebsiteDataType> websiteDataTypes;
</ins><span class="cx">
</span><span class="cx"> if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeCookies])
</span><del>- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeCookies;
</del><ins>+ websiteDataTypes |= WebsiteDataType::Cookies;
</ins><span class="cx"> if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeDiskCache])
</span><del>- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeDiskCache;
</del><ins>+ websiteDataTypes |= WebsiteDataType::DiskCache;
</ins><span class="cx"> if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeMemoryCache])
</span><del>- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMemoryCache;
</del><ins>+ websiteDataTypes |= WebsiteDataType::MemoryCache;
</ins><span class="cx"> if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeOfflineWebApplicationCache])
</span><del>- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeOfflineWebApplicationCache;
</del><ins>+ websiteDataTypes |= WebsiteDataType::OfflineWebApplicationCache;
</ins><span class="cx"> if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeSessionStorage])
</span><del>- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeSessionStorage;
</del><ins>+ websiteDataTypes |= WebsiteDataType::SessionStorage;
</ins><span class="cx"> if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeLocalStorage])
</span><del>- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeLocalStorage;
</del><ins>+ websiteDataTypes |= WebsiteDataType::LocalStorage;
</ins><span class="cx"> if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeWebSQLDatabases])
</span><del>- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases;
</del><ins>+ websiteDataTypes |= WebsiteDataType::WebSQLDatabases;
</ins><span class="cx"> if ([wkWebsiteDataTypes containsObject:WKWebsiteDataTypeIndexedDBDatabases])
</span><del>- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases;
</del><ins>+ websiteDataTypes |= WebsiteDataType::IndexedDBDatabases;
</ins><span class="cx"> if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypeHSTSCache])
</span><del>- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeHSTSCache;
</del><ins>+ websiteDataTypes |= WebsiteDataType::HSTSCache;
</ins><span class="cx"> if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypeMediaKeys])
</span><del>- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeMediaKeys;
</del><ins>+ websiteDataTypes |= WebsiteDataType::MediaKeys;
</ins><span class="cx"> if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypeSearchFieldRecentSearches])
</span><del>- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypeSearchFieldRecentSearches;
</del><ins>+ websiteDataTypes |= WebsiteDataType::SearchFieldRecentSearches;
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> if ([wkWebsiteDataTypes containsObject:_WKWebsiteDataTypePlugInData])
</span><del>- websiteDataTypes |= WebsiteDataTypes::WebsiteDataTypePlugInData;
</del><ins>+ websiteDataTypes |= WebsiteDataType::PlugInData;
</ins><span class="cx"> #endif
</span><del>- return static_cast<WebsiteDataTypes>(websiteDataTypes);
</del><ins>+
+ return websiteDataTypes;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static inline RetainPtr<NSSet> toWKWebsiteDataTypes(int websiteDataTypes)
</del><ins>+static inline RetainPtr<NSSet> toWKWebsiteDataTypes(OptionSet<WebKit::WebsiteDataType> websiteDataTypes)
</ins><span class="cx"> {
</span><del>- using WebsiteDataTypes = WebKit::WebsiteDataTypes;
</del><ins>+// using WebsiteDataTypes = WebKit::WebsiteDataType;
</ins><span class="cx">
</span><span class="cx"> auto wkWebsiteDataTypes = adoptNS([[NSMutableSet alloc] init]);
</span><span class="cx">
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeCookies)
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::Cookies))
</ins><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeCookies];
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeDiskCache)
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::DiskCache))
</ins><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeDiskCache];
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeMemoryCache)
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::MemoryCache))
</ins><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeMemoryCache];
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeOfflineWebApplicationCache)
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::OfflineWebApplicationCache))
</ins><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeOfflineWebApplicationCache];
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeSessionStorage)
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::SessionStorage))
</ins><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeSessionStorage];
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeLocalStorage)
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::LocalStorage))
</ins><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeLocalStorage];
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeWebSQLDatabases)
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::WebSQLDatabases))
</ins><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeWebSQLDatabases];
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeIndexedDBDatabases)
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases))
</ins><span class="cx"> [wkWebsiteDataTypes addObject:WKWebsiteDataTypeIndexedDBDatabases];
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeHSTSCache)
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::HSTSCache))
</ins><span class="cx"> [wkWebsiteDataTypes addObject:_WKWebsiteDataTypeHSTSCache];
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeMediaKeys)
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::MediaKeys))
</ins><span class="cx"> [wkWebsiteDataTypes addObject:_WKWebsiteDataTypeMediaKeys];
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypeSearchFieldRecentSearches)
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::SearchFieldRecentSearches))
</ins><span class="cx"> [wkWebsiteDataTypes addObject:_WKWebsiteDataTypeSearchFieldRecentSearches];
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- if (websiteDataTypes & WebsiteDataTypes::WebsiteDataTypePlugInData)
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::PlugInData))
</ins><span class="cx"> [wkWebsiteDataTypes addObject:_WKWebsiteDataTypePlugInData];
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDatabasesDatabaseProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.cpp 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseProcessProxy::fetchWebsiteData(SessionID sessionID, WebsiteDataTypes dataTypes, std::function<void (WebsiteData)> completionHandler)
</del><ins>+void DatabaseProcessProxy::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::function<void (WebsiteData)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(canSendMessage());
</span><span class="cx">
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> send(Messages::DatabaseProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseProcessProxy::deleteWebsiteData(WebCore::SessionID sessionID, WebsiteDataTypes dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</del><ins>+void DatabaseProcessProxy::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> auto callbackID = generateCallbackID();
</span><span class="cx">
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> send(Messages::DatabaseProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void DatabaseProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, WebsiteDataTypes dataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
</del><ins>+void DatabaseProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(canSendMessage());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessDatabasesDatabaseProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/Databases/DatabaseProcessProxy.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx"> #include "ChildProcessProxy.h"
</span><span class="cx"> #include "ProcessLauncher.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><del>-#include "WebsiteDataTypes.h"
</del><span class="cx"> #include <wtf/Deque.h>
</span><ins>+#include <wtf/Forward.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class SecurityOrigin;
</span><span class="lines">@@ -42,15 +42,16 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class WebProcessPool;
</span><ins>+enum class WebsiteDataType;
</ins><span class="cx">
</span><span class="cx"> class DatabaseProcessProxy : public ChildProcessProxy {
</span><span class="cx"> public:
</span><span class="cx"> static Ref<DatabaseProcessProxy> create(WebProcessPool*);
</span><span class="cx"> ~DatabaseProcessProxy();
</span><span class="cx">
</span><del>- void fetchWebsiteData(WebCore::SessionID, WebsiteDataTypes, std::function<void (WebsiteData)> completionHandler);
- void deleteWebsiteData(WebCore::SessionID, WebsiteDataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
- void deleteWebsiteDataForOrigins(WebCore::SessionID, WebsiteDataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler);
</del><ins>+ void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::function<void (WebsiteData)> completionHandler);
+ void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
+ void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler);
</ins><span class="cx">
</span><span class="cx"> void getDatabaseProcessConnection(PassRefPtr<Messages::WebProcessProxy::GetDatabaseProcessConnection::DelayedReply>);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.cpp 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> return m_downloadProxyMap->createDownloadProxy(m_processPool, resourceRequest);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessProxy::fetchWebsiteData(SessionID sessionID, WebsiteDataTypes dataTypes, std::function<void (WebsiteData)> completionHandler)
</del><ins>+void NetworkProcessProxy::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::function<void (WebsiteData)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(canSendMessage());
</span><span class="cx">
</span><span class="lines">@@ -132,7 +132,7 @@
</span><span class="cx"> send(Messages::WebProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessProxy::deleteWebsiteData(WebCore::SessionID sessionID, WebsiteDataTypes dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</del><ins>+void NetworkProcessProxy::deleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> auto callbackID = generateCallbackID();
</span><span class="cx"> auto token = throttler().backgroundActivityToken();
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> send(Messages::NetworkProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, WebsiteDataTypes dataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, const Vector<String>& cookieHostNames, std::function<void ()> completionHandler)
</del><ins>+void NetworkProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, const Vector<String>& cookieHostNames, std::function<void ()> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(canSendMessage());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessNetworkNetworkProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/Network/NetworkProcessProxy.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "ProcessThrottler.h"
</span><span class="cx"> #include "ProcessThrottlerClient.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><del>-#include "WebsiteDataTypes.h"
</del><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx">
</span><span class="lines">@@ -48,6 +47,7 @@
</span><span class="cx"> class DownloadProxy;
</span><span class="cx"> class DownloadProxyMap;
</span><span class="cx"> class WebProcessPool;
</span><ins>+enum class WebsiteDataType;
</ins><span class="cx"> struct NetworkProcessCreationParameters;
</span><span class="cx">
</span><span class="cx"> class NetworkProcessProxy : public ChildProcessProxy, private ProcessThrottlerClient {
</span><span class="lines">@@ -59,9 +59,9 @@
</span><span class="cx">
</span><span class="cx"> DownloadProxy* createDownloadProxy(const WebCore::ResourceRequest&);
</span><span class="cx">
</span><del>- void fetchWebsiteData(WebCore::SessionID, WebsiteDataTypes, std::function<void (WebsiteData)> completionHandler);
- void deleteWebsiteData(WebCore::SessionID, WebsiteDataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
- void deleteWebsiteDataForOrigins(WebCore::SessionID, WebsiteDataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, const Vector<String>& cookieHostNames, std::function<void ()> completionHandler);
</del><ins>+ void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::function<void (WebsiteData)> completionHandler);
+ void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
+ void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebKit::WebsiteDataType>, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, const Vector<String>& cookieHostNames, std::function<void ()> completionHandler);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void setProcessSuppressionEnabled(bool);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -721,7 +721,7 @@
</span><span class="cx"> page->viewStateDidChange(ViewState::IsVisuallyIdle);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::fetchWebsiteData(SessionID sessionID, WebsiteDataTypes dataTypes, std::function<void (WebsiteData)> completionHandler)
</del><ins>+void WebProcessProxy::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::function<void (WebsiteData)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(canSendMessage());
</span><span class="cx">
</span><span class="lines">@@ -735,7 +735,7 @@
</span><span class="cx"> send(Messages::WebProcess::FetchWebsiteData(sessionID, dataTypes, callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::deleteWebsiteData(SessionID sessionID, WebsiteDataTypes dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</del><ins>+void WebProcessProxy::deleteWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(canSendMessage());
</span><span class="cx">
</span><span class="lines">@@ -748,7 +748,7 @@
</span><span class="cx"> send(Messages::WebProcess::DeleteWebsiteData(sessionID, dataTypes, modifiedSince, callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, WebsiteDataTypes dataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
</del><ins>+void WebProcessProxy::deleteWebsiteDataForOrigins(SessionID sessionID, OptionSet<WebsiteDataType> dataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(canSendMessage());
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebProcessProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "WebConnectionToWebProcess.h"
</span><span class="cx"> #include "WebPageProxy.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><del>-#include "WebsiteDataTypes.h"
</del><span class="cx"> #include <WebCore/LinkHash.h>
</span><span class="cx"> #include <memory>
</span><span class="cx"> #include <wtf/Forward.h>
</span><span class="lines">@@ -61,6 +60,7 @@
</span><span class="cx"> class WebBackForwardListItem;
</span><span class="cx"> class WebPageGroup;
</span><span class="cx"> class WebProcessPool;
</span><ins>+enum class WebsiteDataType;
</ins><span class="cx"> struct WebNavigationDataStore;
</span><span class="cx">
</span><span class="cx"> class WebProcessProxy : public ChildProcessProxy, ResponsivenessTimer::Client, private ProcessThrottlerClient {
</span><span class="lines">@@ -121,9 +121,9 @@
</span><span class="cx"> void didSaveToPageCache();
</span><span class="cx"> void releasePageCache();
</span><span class="cx">
</span><del>- void fetchWebsiteData(WebCore::SessionID, WebsiteDataTypes, std::function<void (WebsiteData)> completionHandler);
- void deleteWebsiteData(WebCore::SessionID, WebsiteDataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
- void deleteWebsiteDataForOrigins(WebCore::SessionID, WebsiteDataTypes, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler);
</del><ins>+ void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::function<void (WebsiteData)> completionHandler);
+ void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
+ void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<RefPtr<WebCore::SecurityOrigin>>& origins, std::function<void ()> completionHandler);
</ins><span class="cx">
</span><span class="cx"> void enableSuddenTermination();
</span><span class="cx"> void disableSuddenTermination();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataRecordcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.cpp 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> return String();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebsiteDataRecord::add(WebsiteDataTypes type, RefPtr<WebCore::SecurityOrigin>&& origin)
</del><ins>+void WebsiteDataRecord::add(WebsiteDataType type, RefPtr<WebCore::SecurityOrigin>&& origin)
</ins><span class="cx"> {
</span><span class="cx"> types |= type;
</span><span class="cx">
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">
</span><span class="cx"> void WebsiteDataRecord::addCookieHostName(const String& hostName)
</span><span class="cx"> {
</span><del>- types |= WebsiteDataTypeCookies;
</del><ins>+ types |= WebsiteDataType::Cookies;
</ins><span class="cx">
</span><span class="cx"> cookieHostNames.add(hostName);
</span><span class="cx"> }
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void WebsiteDataRecord::addPluginDataHostName(const String& hostName)
</span><span class="cx"> {
</span><del>- types |= WebsiteDataTypePlugInData;
</del><ins>+ types |= WebsiteDataType::PlugInData;
</ins><span class="cx">
</span><span class="cx"> pluginDataHostNames.add(hostName);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataRecordh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataRecord.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -26,9 +26,10 @@
</span><span class="cx"> #ifndef WebsiteDataRecord_h
</span><span class="cx"> #define WebsiteDataRecord_h
</span><span class="cx">
</span><del>-#include "WebsiteDataTypes.h"
</del><ins>+#include "WebsiteDataType.h"
</ins><span class="cx"> #include <WebCore/SecurityOriginHash.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><ins>+#include <wtf/OptionSet.h>
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -45,14 +46,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> static String displayNameForOrigin(const WebCore::SecurityOrigin&);
</span><span class="cx">
</span><del>- void add(WebsiteDataTypes, RefPtr<WebCore::SecurityOrigin>&&);
</del><ins>+ void add(WebsiteDataType, RefPtr<WebCore::SecurityOrigin>&&);
</ins><span class="cx"> void addCookieHostName(const String& hostName);
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void addPluginDataHostName(const String& hostName);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> String displayName;
</span><del>- unsigned types { 0 };
</del><ins>+ OptionSet<WebsiteDataType> types;
</ins><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx"> HashSet<String> cookieHostNames;
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStorecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.cpp 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -121,36 +121,36 @@
</span><span class="cx"> Launch,
</span><span class="cx"> };
</span><span class="cx">
</span><del>-static ProcessAccessType computeNetworkProcessAccessTypeForDataFetch(WebsiteDataTypes dataTypes, bool isNonPersistentStore)
</del><ins>+static ProcessAccessType computeNetworkProcessAccessTypeForDataFetch(OptionSet<WebsiteDataType> dataTypes, bool isNonPersistentStore)
</ins><span class="cx"> {
</span><span class="cx"> ProcessAccessType processAccessType = ProcessAccessType::None;
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeCookies) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::Cookies)) {
</ins><span class="cx"> if (isNonPersistentStore)
</span><span class="cx"> processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
</span><span class="cx"> else
</span><span class="cx"> processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeDiskCache && !isNonPersistentStore)
</del><ins>+ if (dataTypes.contains(WebsiteDataType::DiskCache) && !isNonPersistentStore)
</ins><span class="cx"> processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
</span><span class="cx">
</span><span class="cx"> return processAccessType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ProcessAccessType computeWebProcessAccessTypeForDataFetch(WebsiteDataTypes dataTypes, bool isNonPersistentStore)
</del><ins>+static ProcessAccessType computeWebProcessAccessTypeForDataFetch(OptionSet<WebsiteDataType> dataTypes, bool isNonPersistentStore)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(isNonPersistentStore);
</span><span class="cx">
</span><span class="cx"> ProcessAccessType processAccessType = ProcessAccessType::None;
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeMemoryCache)
</del><ins>+ if (dataTypes.contains(WebsiteDataType::MemoryCache))
</ins><span class="cx"> return ProcessAccessType::OnlyIfLaunched;
</span><span class="cx">
</span><span class="cx"> return processAccessType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebsiteDataStore::fetchData(WebsiteDataTypes dataTypes, std::function<void (Vector<WebsiteDataRecord>)> completionHandler)
</del><ins>+void WebsiteDataStore::fetchData(OptionSet<WebsiteDataType> dataTypes, std::function<void (Vector<WebsiteDataRecord>)> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> struct CallbackAggregator final : ThreadSafeRefCounted<CallbackAggregator> {
</span><span class="cx"> explicit CallbackAggregator(std::function<void (Vector<WebsiteDataRecord>)> completionHandler)
</span><span class="lines">@@ -289,33 +289,33 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeSessionStorage && m_storageManager) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::SessionStorage) && m_storageManager) {
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><span class="cx"> m_storageManager->getSessionStorageOrigins([callbackAggregator](HashSet<RefPtr<WebCore::SecurityOrigin>>&& origins) {
</span><span class="cx"> WebsiteData websiteData;
</span><span class="cx">
</span><span class="cx"> while (!origins.isEmpty())
</span><del>- websiteData.entries.append(WebsiteData::Entry { origins.takeAny(), WebsiteDataTypeSessionStorage });
</del><ins>+ websiteData.entries.append(WebsiteData::Entry { origins.takeAny(), WebsiteDataType::SessionStorage });
</ins><span class="cx">
</span><span class="cx"> callbackAggregator->removePendingCallback(WTFMove(websiteData));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::LocalStorage) && m_storageManager) {
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><span class="cx"> m_storageManager->getLocalStorageOrigins([callbackAggregator](HashSet<RefPtr<WebCore::SecurityOrigin>>&& origins) {
</span><span class="cx"> WebsiteData websiteData;
</span><span class="cx">
</span><span class="cx"> while (!origins.isEmpty())
</span><del>- websiteData.entries.append(WebsiteData::Entry { origins.takeAny(), WebsiteDataTypeLocalStorage });
</del><ins>+ websiteData.entries.append(WebsiteData::Entry { origins.takeAny(), WebsiteDataType::LocalStorage });
</ins><span class="cx">
</span><span class="cx"> callbackAggregator->removePendingCallback(WTFMove(websiteData));
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeOfflineWebApplicationCache && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::OfflineWebApplicationCache) && isPersistent()) {
</ins><span class="cx"> StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="lines">@@ -330,14 +330,14 @@
</span><span class="cx"> WebsiteData websiteData;
</span><span class="cx">
</span><span class="cx"> for (auto& origin : origins)
</span><del>- websiteData.entries.append(WebsiteData::Entry { origin, WebsiteDataTypeOfflineWebApplicationCache });
</del><ins>+ websiteData.entries.append(WebsiteData::Entry { origin, WebsiteDataType::OfflineWebApplicationCache });
</ins><span class="cx">
</span><span class="cx"> callbackAggregator->removePendingCallback(WTFMove(websiteData));
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeWebSQLDatabases && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::WebSQLDatabases) && isPersistent()) {
</ins><span class="cx"> StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator, origins]() mutable {
</span><span class="cx"> WebsiteData websiteData;
</span><span class="cx"> for (auto& origin : origins)
</span><del>- websiteData.entries.append(WebsiteData::Entry { WTFMove(origin), WebsiteDataTypeWebSQLDatabases });
</del><ins>+ websiteData.entries.append(WebsiteData::Entry { WTFMove(origin), WebsiteDataType::WebSQLDatabases });
</ins><span class="cx">
</span><span class="cx"> callbackAggregator->removePendingCallback(WTFMove(websiteData));
</span><span class="cx"> });
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><del>- if (dataTypes & WebsiteDataTypeIndexedDBDatabases && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
</ins><span class="cx"> for (auto& processPool : processPools()) {
</span><span class="cx"> processPool->ensureDatabaseProcess();
</span><span class="cx">
</span><span class="lines">@@ -369,7 +369,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeMediaKeys && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
</ins><span class="cx"> StringCapture mediaKeysStorageDirectory { m_mediaKeysStorageDirectory };
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> RunLoop::main().dispatch([callbackAggregator, origins]() mutable {
</span><span class="cx"> WebsiteData websiteData;
</span><span class="cx"> for (auto& origin : origins)
</span><del>- websiteData.entries.append(WebsiteData::Entry { WTFMove(origin), WebsiteDataTypeMediaKeys });
</del><ins>+ websiteData.entries.append(WebsiteData::Entry { WTFMove(origin), WebsiteDataType::MediaKeys });
</ins><span class="cx">
</span><span class="cx"> callbackAggregator->removePendingCallback(WTFMove(websiteData));
</span><span class="cx"> });
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- if (dataTypes & WebsiteDataTypePlugInData && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::PlugInData) && isPersistent()) {
</ins><span class="cx"> class State {
</span><span class="cx"> public:
</span><span class="cx"> static void fetchData(Ref<CallbackAggregator>&& callbackAggregator, Vector<PluginModuleInfo>&& plugins)
</span><span class="lines">@@ -443,39 +443,39 @@
</span><span class="cx"> callbackAggregator->callIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ProcessAccessType computeNetworkProcessAccessTypeForDataRemoval(WebsiteDataTypes dataTypes, bool isNonPersistentStore)
</del><ins>+static ProcessAccessType computeNetworkProcessAccessTypeForDataRemoval(OptionSet<WebsiteDataType> dataTypes, bool isNonPersistentStore)
</ins><span class="cx"> {
</span><span class="cx"> ProcessAccessType processAccessType = ProcessAccessType::None;
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeCookies) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::Cookies)) {
</ins><span class="cx"> if (isNonPersistentStore)
</span><span class="cx"> processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
</span><span class="cx"> else
</span><span class="cx"> processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeDiskCache && !isNonPersistentStore)
</del><ins>+ if (dataTypes.contains(WebsiteDataType::DiskCache) && !isNonPersistentStore)
</ins><span class="cx"> processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeHSTSCache)
</del><ins>+ if (dataTypes.contains(WebsiteDataType::HSTSCache))
</ins><span class="cx"> processAccessType = std::max(processAccessType, ProcessAccessType::Launch);
</span><span class="cx">
</span><span class="cx"> return processAccessType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static ProcessAccessType computeWebProcessAccessTypeForDataRemoval(WebsiteDataTypes dataTypes, bool isNonPersistentStore)
</del><ins>+static ProcessAccessType computeWebProcessAccessTypeForDataRemoval(OptionSet<WebsiteDataType> dataTypes, bool isNonPersistentStore)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(isNonPersistentStore);
</span><span class="cx">
</span><span class="cx"> ProcessAccessType processAccessType = ProcessAccessType::None;
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeMemoryCache)
</del><ins>+ if (dataTypes.contains(WebsiteDataType::MemoryCache))
</ins><span class="cx"> processAccessType = std::max(processAccessType, ProcessAccessType::OnlyIfLaunched);
</span><span class="cx">
</span><span class="cx"> return processAccessType;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebsiteDataStore::removeData(WebsiteDataTypes dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</del><ins>+void WebsiteDataStore::removeData(OptionSet<WebsiteDataType> dataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> struct CallbackAggregator : ThreadSafeRefCounted<CallbackAggregator> {
</span><span class="cx"> explicit CallbackAggregator (std::function<void ()> completionHandler)
</span><span class="lines">@@ -557,7 +557,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeSessionStorage && m_storageManager) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::SessionStorage) && m_storageManager) {
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><span class="cx"> m_storageManager->deleteSessionStorageOrigins([callbackAggregator] {
</span><span class="lines">@@ -565,7 +565,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::LocalStorage) && m_storageManager) {
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><span class="cx"> m_storageManager->deleteLocalStorageOriginsModifiedSince(modifiedSince, [callbackAggregator] {
</span><span class="lines">@@ -573,7 +573,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeOfflineWebApplicationCache && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::OfflineWebApplicationCache) && isPersistent()) {
</ins><span class="cx"> StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="lines">@@ -589,7 +589,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeWebSQLDatabases && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::WebSQLDatabases) && isPersistent()) {
</ins><span class="cx"> StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="lines">@@ -604,7 +604,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><del>- if (dataTypes & WebsiteDataTypeIndexedDBDatabases && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
</ins><span class="cx"> for (auto& processPool : processPools()) {
</span><span class="cx"> processPool->ensureDatabaseProcess();
</span><span class="cx">
</span><span class="lines">@@ -616,7 +616,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeMediaKeys && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
</ins><span class="cx"> StringCapture mediaKeysStorageDirectory { m_mediaKeysStorageDirectory };
</span><span class="cx">
</span><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeSearchFieldRecentSearches && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::SearchFieldRecentSearches) && isPersistent()) {
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><span class="cx"> m_queue->dispatch([modifiedSince, callbackAggregator] {
</span><span class="lines">@@ -643,7 +643,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- if (dataTypes & WebsiteDataTypePlugInData && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::PlugInData) && isPersistent()) {
</ins><span class="cx"> class State {
</span><span class="cx"> public:
</span><span class="cx"> static void deleteData(Ref<CallbackAggregator>&& callbackAggregator, Vector<PluginModuleInfo>&& plugins, std::chrono::system_clock::time_point modifiedSince)
</span><span class="lines">@@ -695,7 +695,7 @@
</span><span class="cx"> callbackAggregator->callIfNeeded();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebsiteDataStore::removeData(WebsiteDataTypes dataTypes, const Vector<WebsiteDataRecord>& dataRecords, std::function<void ()> completionHandler)
</del><ins>+void WebsiteDataStore::removeData(OptionSet<WebsiteDataType> dataTypes, const Vector<WebsiteDataRecord>& dataRecords, std::function<void ()> completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> Vector<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx">
</span><span class="lines">@@ -791,7 +791,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeSessionStorage && m_storageManager) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::SessionStorage) && m_storageManager) {
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><span class="cx"> m_storageManager->deleteSessionStorageEntriesForOrigins(origins, [callbackAggregator] {
</span><span class="lines">@@ -799,7 +799,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeLocalStorage && m_storageManager) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::LocalStorage) && m_storageManager) {
</ins><span class="cx"> callbackAggregator->addPendingCallback();
</span><span class="cx">
</span><span class="cx"> m_storageManager->deleteLocalStorageEntriesForOrigins(origins, [callbackAggregator] {
</span><span class="lines">@@ -807,7 +807,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeOfflineWebApplicationCache && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::OfflineWebApplicationCache) && isPersistent()) {
</ins><span class="cx"> StringCapture applicationCacheDirectory { m_applicationCacheDirectory };
</span><span class="cx">
</span><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="lines">@@ -829,7 +829,7 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeWebSQLDatabases && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::WebSQLDatabases) && isPersistent()) {
</ins><span class="cx"> StringCapture webSQLDatabaseDirectory { m_webSQLDatabaseDirectory };
</span><span class="cx">
</span><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="lines">@@ -852,7 +852,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DATABASE_PROCESS)
</span><del>- if (dataTypes & WebsiteDataTypeIndexedDBDatabases && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::IndexedDBDatabases) && isPersistent()) {
</ins><span class="cx"> for (auto& processPool : processPools()) {
</span><span class="cx"> processPool->ensureDatabaseProcess();
</span><span class="cx">
</span><span class="lines">@@ -864,7 +864,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (dataTypes & WebsiteDataTypeMediaKeys && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::MediaKeys) && isPersistent()) {
</ins><span class="cx"> StringCapture mediaKeysStorageDirectory { m_mediaKeysStorageDirectory };
</span><span class="cx"> HashSet<RefPtr<WebCore::SecurityOrigin>> origins;
</span><span class="cx"> for (const auto& dataRecord : dataRecords) {
</span><span class="lines">@@ -884,7 +884,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><del>- if (dataTypes & WebsiteDataTypePlugInData && isPersistent()) {
</del><ins>+ if (dataTypes.contains(WebsiteDataType::PlugInData) && isPersistent()) {
</ins><span class="cx"> Vector<String> hostNames;
</span><span class="cx"> for (const auto& dataRecord : dataRecords) {
</span><span class="cx"> for (const auto& hostName : dataRecord.pluginDataHostNames)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebsiteDataWebsiteDataStoreh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/UIProcess/WebsiteData/WebsiteDataStore.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx"> #define WebsiteDataStore_h
</span><span class="cx">
</span><span class="cx"> #include "WebProcessLifetimeObserver.h"
</span><del>-#include "WebsiteDataTypes.h"
</del><span class="cx"> #include <WebCore/SecurityOriginHash.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><ins>+#include <wtf/OptionSet.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/WorkQueue.h>
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> class StorageManager;
</span><span class="cx"> class WebPageProxy;
</span><span class="cx"> class WebProcessPool;
</span><ins>+enum class WebsiteDataType;
</ins><span class="cx"> struct WebsiteDataRecord;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="lines">@@ -73,9 +74,9 @@
</span><span class="cx">
</span><span class="cx"> static void cloneSessionData(WebPageProxy& sourcePage, WebPageProxy& newPage);
</span><span class="cx">
</span><del>- void fetchData(WebsiteDataTypes, std::function<void (Vector<WebsiteDataRecord>)> completionHandler);
- void removeData(WebsiteDataTypes, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
- void removeData(WebsiteDataTypes, const Vector<WebsiteDataRecord>&, std::function<void ()> completionHandler);
</del><ins>+ void fetchData(OptionSet<WebsiteDataType>, std::function<void (Vector<WebsiteDataRecord>)> completionHandler);
+ void removeData(OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, std::function<void ()> completionHandler);
+ void removeData(OptionSet<WebsiteDataType>, const Vector<WebsiteDataRecord>&, std::function<void ()> completionHandler);
</ins><span class="cx">
</span><span class="cx"> StorageManager* storageManager() { return m_storageManager.get(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -2358,7 +2358,7 @@
</span><span class="cx"> 1ABC3DF31899E437004F0626 /* NavigationState.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = NavigationState.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1ABC3DF41899E437004F0626 /* NavigationState.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NavigationState.h; sourceTree = "<group>"; };
</span><span class="cx"> 1ABC3DFB1899F51C004F0626 /* WKNavigationDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKNavigationDelegate.h; sourceTree = "<group>"; };
</span><del>- 1ABF43791A368050003FB0E6 /* WebsiteDataTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsiteDataTypes.h; sourceTree = "<group>"; };
</del><ins>+ 1ABF43791A368050003FB0E6 /* WebsiteDataType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebsiteDataType.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1AC0273E196622D600C12B75 /* WebPageProxyCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPageProxyCocoa.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AC1336518565B5700F3EC05 /* UserData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserData.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AC1336618565B5700F3EC05 /* UserData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserData.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4607,7 +4607,7 @@
</span><span class="cx"> children = (
</span><span class="cx"> 1A4832D41A9CDF96008B4DFE /* WebsiteData.cpp */,
</span><span class="cx"> 1A4832D51A9CDF96008B4DFE /* WebsiteData.h */,
</span><del>- 1ABF43791A368050003FB0E6 /* WebsiteDataTypes.h */,
</del><ins>+ 1ABF43791A368050003FB0E6 /* WebsiteDataType.h */,
</ins><span class="cx"> );
</span><span class="cx"> path = WebsiteData;
</span><span class="cx"> sourceTree = "<group>";
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> #include "WebProcessPoolMessages.h"
</span><span class="cx"> #include "WebProcessProxyMessages.h"
</span><span class="cx"> #include "WebsiteData.h"
</span><del>-#include "WebsiteDataTypes.h"
</del><ins>+#include "WebsiteDataType.h"
</ins><span class="cx"> #include <JavaScriptCore/JSLock.h>
</span><span class="cx"> #include <JavaScriptCore/MemoryStatistics.h>
</span><span class="cx"> #include <WebCore/AXObjectCache.h>
</span><span class="lines">@@ -1111,23 +1111,23 @@
</span><span class="cx"> PageCache::singleton().pruneToSizeNow(0, PruningReason::MemoryPressure);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::fetchWebsiteData(SessionID sessionID, uint64_t websiteDataTypes, uint64_t callbackID)
</del><ins>+void WebProcess::fetchWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> WebsiteData websiteData;
</span><span class="cx">
</span><del>- if (websiteDataTypes & WebsiteDataTypeMemoryCache) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::MemoryCache)) {
</ins><span class="cx"> for (auto& origin : MemoryCache::singleton().originsWithCache(sessionID))
</span><del>- websiteData.entries.append(WebsiteData::Entry { origin, WebsiteDataTypeMemoryCache });
</del><ins>+ websiteData.entries.append(WebsiteData::Entry { origin, WebsiteDataType::MemoryCache });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> parentProcessConnection()->send(Messages::WebProcessProxy::DidFetchWebsiteData(callbackID, websiteData), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::deleteWebsiteData(SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</del><ins>+void WebProcess::deleteWebsiteData(SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
</ins><span class="cx"> {
</span><span class="cx"> UNUSED_PARAM(modifiedSince);
</span><span class="cx">
</span><del>- if (websiteDataTypes & WebsiteDataTypeMemoryCache) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::MemoryCache)) {
</ins><span class="cx"> PageCache::singleton().pruneToSizeNow(0, PruningReason::None);
</span><span class="cx"> MemoryCache::singleton().evictResources(sessionID);
</span><span class="cx">
</span><span class="lines">@@ -1137,9 +1137,9 @@
</span><span class="cx"> parentProcessConnection()->send(Messages::WebProcessProxy::DidDeleteWebsiteData(callbackID), 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, const Vector<WebCore::SecurityOriginData>& originDatas, uint64_t callbackID)
</del><ins>+void WebProcess::deleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebsiteDataType> websiteDataTypes, const Vector<WebCore::SecurityOriginData>& originDatas, uint64_t callbackID)
</ins><span class="cx"> {
</span><del>- if (websiteDataTypes & WebsiteDataTypeMemoryCache) {
</del><ins>+ if (websiteDataTypes.contains(WebsiteDataType::MemoryCache)) {
</ins><span class="cx"> HashSet<RefPtr<SecurityOrigin>> origins;
</span><span class="cx"> for (auto& originData : originDatas)
</span><span class="cx"> origins.add(originData.securityOrigin());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.h (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.h 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -82,6 +82,7 @@
</span><span class="cx"> class WebPage;
</span><span class="cx"> class WebPageGroupProxy;
</span><span class="cx"> class WebProcessSupplement;
</span><ins>+enum class WebsiteDataType;
</ins><span class="cx"> struct WebPageCreationParameters;
</span><span class="cx"> struct WebPageGroupData;
</span><span class="cx"> struct WebPreferencesStore;
</span><span class="lines">@@ -255,9 +256,9 @@
</span><span class="cx">
</span><span class="cx"> void releasePageCache();
</span><span class="cx">
</span><del>- void fetchWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, uint64_t callbackID);
- void deleteWebsiteData(WebCore::SessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
- void deleteWebsiteDataForOrigins(WebCore::SessionID, uint64_t websiteDataTypes, const Vector<WebCore::SecurityOriginData>& origins, uint64_t callbackID);
</del><ins>+ void fetchWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, uint64_t callbackID);
+ void deleteWebsiteData(WebCore::SessionID, OptionSet<WebsiteDataType>, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID);
+ void deleteWebsiteDataForOrigins(WebCore::SessionID, OptionSet<WebsiteDataType>, const Vector<WebCore::SecurityOriginData>& origins, uint64_t callbackID);
</ins><span class="cx">
</span><span class="cx"> void setMemoryCacheDisabled(bool);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcessmessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.messages.in (197190 => 197191)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2016-02-26 19:49:35 UTC (rev 197190)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.messages.in 2016-02-26 19:49:36 UTC (rev 197191)
</span><span class="lines">@@ -75,9 +75,9 @@
</span><span class="cx">
</span><span class="cx"> ReleasePageCache()
</span><span class="cx">
</span><del>- FetchWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, uint64_t callbackID)
- DeleteWebsiteData(WebCore::SessionID sessionID, uint64_t websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
- DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, uint64_t websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, uint64_t callbackID)
</del><ins>+ FetchWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, uint64_t callbackID)
+ DeleteWebsiteData(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, std::chrono::system_clock::time_point modifiedSince, uint64_t callbackID)
+ DeleteWebsiteDataForOrigins(WebCore::SessionID sessionID, OptionSet<WebKit::WebsiteDataType> websiteDataTypes, Vector<WebCore::SecurityOriginData> origins, uint64_t callbackID)
</ins><span class="cx">
</span><span class="cx"> SetProcessSuppressionEnabled(bool flag)
</span><span class="cx"> #if PLATFORM(COCOA)
</span></span></pre>
</div>
</div>
</body>
</html>