Log Message
Merge r197191,r197523 - Add WTF::OptionSet and use it for the website data types enum https://bugs.webkit.org/show_bug.cgi?id=154733
Patch by Anders Carlsson <[email protected]> on 2016-02-26 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|=):
Modified Paths
- releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog
- releases/WebKitGTK/webkit-2.12/Source/WTF/WTF.xcodeproj/project.pbxproj
- releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/CMakeLists.txt
- releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/Forward.h
- releases/WebKitGTK/webkit-2.12/Tools/ChangeLog
- releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/CMakeLists.txt
- releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj
Added Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog (199352 => 199353)
--- releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog 2016-04-12 15:21:51 UTC (rev 199352)
+++ releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog 2016-04-12 15:45:42 UTC (rev 199353)
@@ -1,3 +1,35 @@
+2016-03-03 Daniel Bates <[email protected]>
+
+ Add unit tests for WTF::OptionSet
+ https://bugs.webkit.org/show_bug.cgi?id=154925
+ <rdar://problem/24964211>
+
+ Reviewed by Darin Adler.
+
+ * wtf/CMakeLists.txt: Add header OptionSet.h to the list of WTF headers.
+ * wtf/OptionSet.h: Use in-class initialization to initialize m_storage and declare
+ the trivial constexpr constructor as default.
+ (WTF::OptionSet::OptionSet): For convenience add a constructor that takes a std::initializer_list.
+ This code was written by Anders Carlsson.
+
+2016-02-26 Anders Carlsson <[email protected]>
+
+ 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|=):
+
2016-02-25 Sam Weinig <[email protected]>
HashMap::ensure() should return an AddResult like all the other add-like functions.
Modified: releases/WebKitGTK/webkit-2.12/Source/WTF/WTF.xcodeproj/project.pbxproj (199352 => 199353)
--- releases/WebKitGTK/webkit-2.12/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-04-12 15:21:51 UTC (rev 199352)
+++ releases/WebKitGTK/webkit-2.12/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-04-12 15:45:42 UTC (rev 199353)
@@ -81,6 +81,7 @@
1A1D8B9C173186CE00141DA4 /* FunctionDispatcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A1D8B9B173186CE00141DA4 /* FunctionDispatcher.h */; };
1A1D8B9E1731879800141DA4 /* FunctionDispatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A1D8B9D1731879800141DA4 /* FunctionDispatcher.cpp */; };
1A233C7D17DAA6E300A93ACF /* MallocPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A233C7C17DAA6E300A93ACF /* MallocPtr.h */; };
+ 1A4656191C7FC68E00F5920F /* OptionSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A4656181C7FC68E00F5920F /* OptionSet.h */; };
1A6BB769162F300500DD16DB /* StreamBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6BB768162F300500DD16DB /* StreamBuffer.h */; };
1A6EB1E0187D0BD30030126F /* StringView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6EB1DF187D0BD30030126F /* StringView.h */; };
1A944F471C3D8814005BD28C /* BlockPtr.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A944F461C3D8814005BD28C /* BlockPtr.h */; };
@@ -390,6 +391,7 @@
1A1D8B9D1731879800141DA4 /* FunctionDispatcher.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FunctionDispatcher.cpp; sourceTree = "<group>"; };
1A233C7C17DAA6E300A93ACF /* MallocPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MallocPtr.h; sourceTree = "<group>"; };
1A3F6BE6174ADA2100B2EEA7 /* NeverDestroyed.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NeverDestroyed.h; sourceTree = "<group>"; };
+ 1A4656181C7FC68E00F5920F /* OptionSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OptionSet.h; sourceTree = "<group>"; };
1A6BB768162F300500DD16DB /* StreamBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StreamBuffer.h; sourceTree = "<group>"; };
1A6EB1DF187D0BD30030126F /* StringView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringView.h; sourceTree = "<group>"; };
1A944F461C3D8814005BD28C /* BlockPtr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BlockPtr.h; sourceTree = "<group>"; };
@@ -852,6 +854,7 @@
A8A472D6151A825B004123FF /* NumberOfCores.h */,
7E29C33D15FFD79B00516D61 /* ObjcRuntimeExtras.h */,
1AFDE6521953B23D00C48FFA /* Optional.h */,
+ 1A4656181C7FC68E00F5920F /* OptionSet.h */,
0F9495831C571CC900413A48 /* OrderMaker.h */,
A8A472D7151A825B004123FF /* OSAllocator.h */,
A8A472D8151A825B004123FF /* OSAllocatorPosix.cpp */,
@@ -1120,7 +1123,6 @@
A8A47385151A825B004123FF /* ASCIICType.h in Headers */,
A8A47434151A825B004123FF /* ASCIIFastPath.h in Headers */,
A8A47387151A825B004123FF /* Assertions.h in Headers */,
- 0F3501641BB258D500F0A2A3 /* WeakRandom.h in Headers */,
A8A47388151A825B004123FF /* Atomics.h in Headers */,
A8A47436151A825B004123FF /* AtomicString.h in Headers */,
A8A47437151A825B004123FF /* AtomicStringHash.h in Headers */,
@@ -1130,16 +1132,16 @@
0FB14E19180FA218009B6B4D /* Bag.h in Headers */,
0FB14E1B1810E1DC009B6B4D /* BagToHashMap.h in Headers */,
8134013915B092FD001FF0B8 /* Base64.h in Headers */,
- 0FEB3DD11BB7366B009D7AAD /* ParallelVectorIterator.h in Headers */,
A8A473A9151A825B004123FF /* bignum-dtoa.h in Headers */,
A8A473AB151A825B004123FF /* bignum.h in Headers */,
- 0FFF19DD1BB334EB00886D91 /* ParallelHelperPool.h in Headers */,
A8A47452151A825B004123FF /* BinarySemaphore.h in Headers */,
A8A4738A151A825B004123FF /* Bitmap.h in Headers */,
A8A4738C151A825B004123FF /* BitVector.h in Headers */,
- A5098B021C16A4F900087797 /* SecuritySPI.h in Headers */,
+ 1A944F471C3D8814005BD28C /* BlockPtr.h in Headers */,
A8A4738E151A825B004123FF /* BlockStack.h in Headers */,
A8A4738F151A825B004123FF /* BloomFilter.h in Headers */,
+ 0F93274B1C17F4B700CF6564 /* Box.h in Headers */,
+ 0F4570451BE834410062A629 /* BubbleSort.h in Headers */,
A8A47391151A825B004123FF /* BumpPointerAllocator.h in Headers */,
EB95E1F0161A72410089A2F5 /* ByteOrder.h in Headers */,
A8A473AD151A825B004123FF /* cached-powers.h in Headers */,
@@ -1165,16 +1167,15 @@
A8A473A5151A825B004123FF /* Deque.h in Headers */,
A8A473A6151A825B004123FF /* DisallowCType.h in Headers */,
A8A473AF151A825B004123FF /* diy-fp.h in Headers */,
+ 0F4570431BE5B58F0062A629 /* Dominators.h in Headers */,
A8A473B1151A825B004123FF /* double-conversion.h in Headers */,
A8A473B2151A825B004123FF /* double.h in Headers */,
A8A473A7151A825B004123FF /* DoublyLinkedList.h in Headers */,
A8A473BB151A825B004123FF /* dtoa.h in Headers */,
A8A473C1151A825B004123FF /* ExportMacros.h in Headers */,
- 1A944F471C3D8814005BD28C /* BlockPtr.h in Headers */,
A8A473B4151A825B004123FF /* fast-dtoa.h in Headers */,
0FD81AC5154FB22E00983E72 /* FastBitVector.h in Headers */,
A8A473C4151A825B004123FF /* FastMalloc.h in Headers */,
- 0F725CAC1C50461600AD943A /* RangeSet.h in Headers */,
B38FD7BD168953E80065C969 /* FeatureDefines.h in Headers */,
0F9D3361165DBA73005AD387 /* FilePrintStream.h in Headers */,
A8A473B6151A825B004123FF /* fixed-dtoa.h in Headers */,
@@ -1183,21 +1184,21 @@
A8A473C9151A825B004123FF /* Functional.h in Headers */,
1A1D8B9C173186CE00141DA4 /* FunctionDispatcher.h in Headers */,
A8A473CA151A825B004123FF /* GetPtr.h in Headers */,
+ 0FEC84AF1BD825310080FF74 /* GraphNodeWorklist.h in Headers */,
2C05385415BC819000F21B96 /* GregorianDateTime.h in Headers */,
A8A473D3151A825B004123FF /* HashCountedSet.h in Headers */,
A8A4742D151A825B004123FF /* Hasher.h in Headers */,
A8A473D4151A825B004123FF /* HashFunctions.h in Headers */,
A8A473D5151A825B004123FF /* HashIterators.h in Headers */,
A8A473D6151A825B004123FF /* HashMap.h in Headers */,
- 0FEB3DCF1BB5D684009D7AAD /* SharedTask.h in Headers */,
A8A473D7151A825B004123FF /* HashSet.h in Headers */,
A8A473D9151A825B004123FF /* HashTable.h in Headers */,
A8A473DA151A825B004123FF /* HashTraits.h in Headers */,
A8A473DB151A825B004123FF /* HexNumber.h in Headers */,
+ 2684D4361C000D400081D663 /* IndexSparseSet.h in Headers */,
A8A473DC151A825B004123FF /* InlineASM.h in Headers */,
A70DA0841799F04D00529A9B /* Insertion.h in Headers */,
26147B0A15DDCCDC00DDB907 /* IntegerToStringConversion.h in Headers */,
- 0FB317C41C488001007E395A /* SystemTracing.h in Headers */,
7CDD7FF8186D291E007433CD /* IteratorAdaptors.h in Headers */,
7CDD7FFA186D2A54007433CD /* IteratorRange.h in Headers */,
93AC91A818942FC400244939 /* LChar.h in Headers */,
@@ -1211,7 +1212,6 @@
A8A473EA151A825B004123FF /* MD5.h in Headers */,
CD5497AD15857D0300B5BC30 /* MediaTime.h in Headers */,
A8A473EB151A825B004123FF /* MessageQueue.h in Headers */,
- 0F9495841C571CC900413A48 /* OrderMaker.h in Headers */,
A8A473ED151A825B004123FF /* MetaAllocator.h in Headers */,
A8A473EE151A825B004123FF /* MetaAllocatorHandle.h in Headers */,
FE8225311B2A1E5B00BA68FD /* NakedPtr.h in Headers */,
@@ -1221,27 +1221,31 @@
A8A473F5151A825B004123FF /* NumberOfCores.h in Headers */,
7E29C33E15FFD79B00516D61 /* ObjcRuntimeExtras.h in Headers */,
1AFDE6531953B23D00C48FFA /* Optional.h in Headers */,
+ 1A4656191C7FC68E00F5920F /* OptionSet.h in Headers */,
+ 0F9495841C571CC900413A48 /* OrderMaker.h in Headers */,
A8A473F6151A825B004123FF /* OSAllocator.h in Headers */,
7CBBA07419BB7FDC00BBF025 /* OSObjectPtr.h in Headers */,
- 0F4570431BE5B58F0062A629 /* Dominators.h in Headers */,
A8A473FA151A825B004123FF /* OSRandomSource.h in Headers */,
A8A473FE151A825B004123FF /* PackedIntVector.h in Headers */,
A8A473FF151A825B004123FF /* PageAllocation.h in Headers */,
A8A47403151A825B004123FF /* PageBlock.h in Headers */,
A8A47404151A825B004123FF /* PageReservation.h in Headers */,
+ 0FFF19DD1BB334EB00886D91 /* ParallelHelperPool.h in Headers */,
A8A47405151A825B004123FF /* ParallelJobs.h in Headers */,
A8A47408151A825B004123FF /* ParallelJobsLibdispatch.h in Headers */,
+ 0FEB3DD11BB7366B009D7AAD /* ParallelVectorIterator.h in Headers */,
0F824A691B7443A0002E345D /* ParkingLot.h in Headers */,
A8A4740C151A825B004123FF /* PassRefPtr.h in Headers */,
A876DBD8151816E500DADB95 /* Platform.h in Headers */,
+ 0FF860951BCCBD740045127F /* PointerComparison.h in Headers */,
0F9D3363165DBA73005AD387 /* PrintStream.h in Headers */,
0FC4488316FE9FE100844BE9 /* ProcessID.h in Headers */,
143F61201565F0F900DB514A /* RAMSize.h in Headers */,
A8A47415151A825B004123FF /* RandomNumber.h in Headers */,
A8A47416151A825B004123FF /* RandomNumberSeed.h in Headers */,
+ 0F725CAC1C50461600AD943A /* RangeSet.h in Headers */,
0F87105A16643F190090B0AD /* RawPointer.h in Headers */,
A8A47417151A825B004123FF /* RedBlackTree.h in Headers */,
- 553071CA1C40427200384898 /* TinyLRUCache.h in Headers */,
26299B6E17A9E5B800ADEBE5 /* Ref.h in Headers */,
A8A47418151A825B004123FF /* RefCounted.h in Headers */,
A8A47419151A825B004123FF /* RefCountedArray.h in Headers */,
@@ -1251,29 +1255,29 @@
A8A4741E151A825B004123FF /* RetainPtr.h in Headers */,
2CDED0F418115C85004DBA70 /* RunLoop.h in Headers */,
1469419216EAAF6D0024E146 /* RunLoopTimer.h in Headers */,
+ A5098B001C169E0700087797 /* SandboxSPI.h in Headers */,
14F3B0F715E45E4600210069 /* SaturatedArithmetic.h in Headers */,
1469419616EAAFF80024E146 /* SchedulePair.h in Headers */,
+ 0FEC84B11BDACD390080FF74 /* ScopedLambda.h in Headers */,
+ A5098B021C16A4F900087797 /* SecuritySPI.h in Headers */,
A8A4741F151A825B004123FF /* SegmentedVector.h in Headers */,
A8A47420151A825B004123FF /* SentinelLinkedList.h in Headers */,
A8A47422151A825B004123FF /* SHA1.h in Headers */,
+ 0FEB3DCF1BB5D684009D7AAD /* SharedTask.h in Headers */,
A8A47423151A825B004123FF /* SimpleStats.h in Headers */,
- 0FF860951BCCBD740045127F /* PointerComparison.h in Headers */,
A8A47424151A825B004123FF /* SinglyLinkedList.h in Headers */,
A748745317A0BDAE00FA04CB /* SixCharacterHash.h in Headers */,
A8A47426151A825B004123FF /* Spectrum.h in Headers */,
A8A47428151A825B004123FF /* StackBounds.h in Headers */,
- 2684D4361C000D400081D663 /* IndexSparseSet.h in Headers */,
FEDACD3E1630F83F00C69634 /* StackStats.h in Headers */,
A8A47429151A825B004123FF /* StaticConstructors.h in Headers */,
A8A4742A151A825B004123FF /* StdLibExtras.h in Headers */,
- 0F4570451BE834410062A629 /* BubbleSort.h in Headers */,
C4F8A93719C65EB400B2B15D /* Stopwatch.h in Headers */,
1A6BB769162F300500DD16DB /* StreamBuffer.h in Headers */,
A8A4743B151A825B004123FF /* StringBuffer.h in Headers */,
A8A4743D151A825B004123FF /* StringBuilder.h in Headers */,
430B47891AAAAC1A001223DA /* StringCommon.h in Headers */,
A8A4743E151A825B004123FF /* StringConcatenate.h in Headers */,
- 0F93274B1C17F4B700CF6564 /* Box.h in Headers */,
A8A4742C151A825B004123FF /* StringExtras.h in Headers */,
A8A4743F151A825B004123FF /* StringHash.h in Headers */,
A748745417A0BDAE00FA04CB /* StringHashDumpContext.h in Headers */,
@@ -1284,30 +1288,30 @@
A8A473B8151A825B004123FF /* strtod.h in Headers */,
70ECA60E1B02426800449739 /* SymbolImpl.h in Headers */,
70A993FF1AD7151300FA615B /* SymbolRegistry.h in Headers */,
+ 0FB317C41C488001007E395A /* SystemTracing.h in Headers */,
A8A47433151A825B004123FF /* TemporaryChange.h in Headers */,
A8A47444151A825B004123FF /* TextPosition.h in Headers */,
A8A47447151A825B004123FF /* ThreadFunctionInvocation.h in Headers */,
A8A47449151A825B004123FF /* ThreadIdentifierDataPthreads.h in Headers */,
A8A4744B151A825B004123FF /* Threading.h in Headers */,
A8A4744D151A825B004123FF /* ThreadingPrimitives.h in Headers */,
- 0FEC84B11BDACD390080FF74 /* ScopedLambda.h in Headers */,
A8A47454151A825B004123FF /* ThreadSafeRefCounted.h in Headers */,
A8A47455151A825B004123FF /* ThreadSpecific.h in Headers */,
+ 553071CA1C40427200384898 /* TinyLRUCache.h in Headers */,
0FED67B61B22D4D80066CE15 /* TinyPtrSet.h in Headers */,
149EF16316BBFE0D000A4331 /* TriState.h in Headers */,
83FBA93219DF459700F30ADB /* TypeCasts.h in Headers */,
1AFDE648195201C300C48FFA /* TypeCastsCF.h in Headers */,
A8A4746D151A825B004123FF /* UnionFind.h in Headers */,
70ECA60F1B02426800449739 /* UniquedStringImpl.h in Headers */,
- 0FEC84AF1BD825310080FF74 /* GraphNodeWorklist.h in Headers */,
A8A4746A151A825B004123FF /* UTF8.h in Headers */,
A8A473B9151A825B004123FF /* utils.h in Headers */,
A8A4747D151A825B004123FF /* ValueCheck.h in Headers */,
A8A4747E151A825B004123FF /* Vector.h in Headers */,
A8A4747F151A825B004123FF /* VectorTraits.h in Headers */,
- A5098B001C169E0700087797 /* SandboxSPI.h in Headers */,
A8A47480151A825B004123FF /* VMTags.h in Headers */,
974CFC8E16A4F327006D5404 /* WeakPtr.h in Headers */,
+ 0F3501641BB258D500F0A2A3 /* WeakRandom.h in Headers */,
1FA47C8B152502DA00568D1B /* WebCoreThread.h in Headers */,
0FE4479D1B7AAA03009498EB /* WordLock.h in Headers */,
E4A0AD3A1A96245500536DF6 /* WorkQueue.h in Headers */,
@@ -1458,6 +1462,7 @@
A8A473F7151A825B004123FF /* OSAllocatorPosix.cpp in Sources */,
A8A473F9151A825B004123FF /* OSRandomSource.cpp in Sources */,
A8A47402151A825B004123FF /* PageBlock.cpp in Sources */,
+ 0FFF19DC1BB334EB00886D91 /* ParallelHelperPool.cpp in Sources */,
0F824A681B7443A0002E345D /* ParkingLot.cpp in Sources */,
0F9D3362165DBA73005AD387 /* PrintStream.cpp in Sources */,
143F611F1565F0F900DB514A /* RAMSize.cpp in Sources */,
@@ -1467,7 +1472,6 @@
2CDED0F318115C85004DBA70 /* RunLoop.cpp in Sources */,
2CDED0EF18115C38004DBA70 /* RunLoopCF.cpp in Sources */,
1469419316EAAF6D0024E146 /* RunLoopTimerCF.cpp in Sources */,
- 0FFF19DC1BB334EB00886D91 /* ParallelHelperPool.cpp in Sources */,
1469419916EAB0410024E146 /* SchedulePairCF.cpp in Sources */,
1469419716EAAFF80024E146 /* SchedulePairMac.mm in Sources */,
A8A47421151A825B004123FF /* SHA1.cpp in Sources */,
Modified: releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/CMakeLists.txt (199352 => 199353)
--- releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/CMakeLists.txt 2016-04-12 15:21:51 UTC (rev 199352)
+++ releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/CMakeLists.txt 2016-04-12 15:45:42 UTC (rev 199353)
@@ -60,6 +60,7 @@
NumberOfCores.h
OSAllocator.h
OSRandomSource.h
+ OptionSet.h
OrderMaker.h
PageAllocation.h
PageBlock.h
Modified: releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/Forward.h (199352 => 199353)
--- releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/Forward.h 2016-04-12 15:21:51 UTC (rev 199352)
+++ releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/Forward.h 2016-04-12 15:45:42 UTC (rev 199353)
@@ -28,10 +28,11 @@
template<typename T> class Function;
template<typename T> class LazyNeverDestroyed;
template<typename T> class NeverDestroyed;
+template<typename T> class OptionSet;
template<typename T> class Optional;
template<typename T> class PassRefPtr;
+template<typename T> class Ref;
template<typename T> class RefPtr;
-template<typename T> class Ref;
template<typename T> class StringBuffer;
template<typename T, size_t inlineCapacity, typename OverflowHandler, size_t minCapacity> class Vector;
@@ -63,6 +64,7 @@
using WTF::FunctionDispatcher;
using WTF::LazyNeverDestroyed;
using WTF::NeverDestroyed;
+using WTF::OptionSet;
using WTF::Optional;
using WTF::OrdinalNumber;
using WTF::PassRefPtr;
Added: releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/OptionSet.h (0 => 199353)
--- releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/OptionSet.h (rev 0)
+++ releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/OptionSet.h 2016-04-12 15:45:42 UTC (rev 199353)
@@ -0,0 +1,81 @@
+/*
+ * 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 <initializer_list>
+#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() = default;
+
+ constexpr OptionSet(T t)
+ : m_storage(static_cast<StorageType>(t))
+ {
+ }
+
+ // FIXME: Make this constexpr once we adopt C++14 as C++11 does not support for-loops
+ // in a constexpr function.
+ OptionSet(std::initializer_list<T> initializerList)
+ {
+ for (auto& option : initializerList)
+ m_storage |= static_cast<StorageType>(option);
+ }
+
+ 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 { 0 };
+};
+
+}
+
+using WTF::OptionSet;
+
+#endif // OptionSet_h
Modified: releases/WebKitGTK/webkit-2.12/Tools/ChangeLog (199352 => 199353)
--- releases/WebKitGTK/webkit-2.12/Tools/ChangeLog 2016-04-12 15:21:51 UTC (rev 199352)
+++ releases/WebKitGTK/webkit-2.12/Tools/ChangeLog 2016-04-12 15:45:42 UTC (rev 199353)
@@ -1,3 +1,18 @@
+2016-03-03 Daniel Bates <[email protected]>
+
+ Add unit tests for WTF::OptionSet
+ https://bugs.webkit.org/show_bug.cgi?id=154925
+ <rdar://problem/24964211>
+
+ Reviewed by Darin Adler.
+
+ Add tests to ensure that we do not regress the behavior of WTF::OptionSet.
+
+ * TestWebKitAPI/CMakeLists.txt: Add file TestWebKitAPI/Tests/WTF/OptionSet.cpp.
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: Ditto.
+ * TestWebKitAPI/Tests/WTF/OptionSet.cpp: Added.
+ (TestWebKitAPI::TEST):
+
2016-03-09 Tim Horton <[email protected]>
Removing and re-adding a script message handler with the same name results in an unusable message handler
Modified: releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/CMakeLists.txt (199352 => 199353)
--- releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/CMakeLists.txt 2016-04-12 15:21:51 UTC (rev 199352)
+++ releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/CMakeLists.txt 2016-04-12 15:45:42 UTC (rev 199353)
@@ -58,6 +58,7 @@
${TESTWEBKITAPI_DIR}/Tests/WTF/MediaTime.cpp
${TESTWEBKITAPI_DIR}/Tests/WTF/MetaAllocator.cpp
${TESTWEBKITAPI_DIR}/Tests/WTF/NakedPtr.cpp
+ ${TESTWEBKITAPI_DIR}/Tests/WTF/OptionSet.cpp
${TESTWEBKITAPI_DIR}/Tests/WTF/ParkingLot.cpp
${TESTWEBKITAPI_DIR}/Tests/WTF/RedBlackTree.cpp
${TESTWEBKITAPI_DIR}/Tests/WTF/Ref.cpp
Modified: releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (199352 => 199353)
--- releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-04-12 15:21:51 UTC (rev 199352)
+++ releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-04-12 15:45:42 UTC (rev 199353)
@@ -329,6 +329,7 @@
CE3524F81B1431F60028A7C5 /* TextFieldDidBeginAndEndEditing_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE3524F21B142B8D0028A7C5 /* TextFieldDidBeginAndEndEditing_Bundle.cpp */; };
CE3524F91B1441C40028A7C5 /* TextFieldDidBeginAndEndEditing.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE3524F11B142B8D0028A7C5 /* TextFieldDidBeginAndEndEditing.cpp */; };
CE3524FA1B1443890028A7C5 /* input-focus-blur.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CE3524F51B142BBB0028A7C5 /* input-focus-blur.html */; };
+ CE50D8CA1C8665CE0072EA5A /* OptionSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE50D8C81C8665CE0072EA5A /* OptionSet.cpp */; };
CEA6CF2819CCF69D0064F5A7 /* open-and-close-window.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CEA6CF2719CCF69D0064F5A7 /* open-and-close-window.html */; };
CEBABD491B71687C0051210A /* should-open-external-schemes.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = CEBABD481B71687C0051210A /* should-open-external-schemes.html */; };
E1220DCA155B28AA0013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = E1220DC9155B287D0013E2FC /* MemoryCacheDisableWithinResourceLoadDelegate.html */; };
@@ -809,6 +810,7 @@
CE3524F11B142B8D0028A7C5 /* TextFieldDidBeginAndEndEditing.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextFieldDidBeginAndEndEditing.cpp; sourceTree = "<group>"; };
CE3524F21B142B8D0028A7C5 /* TextFieldDidBeginAndEndEditing_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextFieldDidBeginAndEndEditing_Bundle.cpp; sourceTree = "<group>"; };
CE3524F51B142BBB0028A7C5 /* input-focus-blur.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = "input-focus-blur.html"; sourceTree = "<group>"; };
+ CE50D8C81C8665CE0072EA5A /* OptionSet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OptionSet.cpp; sourceTree = "<group>"; };
CEA6CF2219CCF5BD0064F5A7 /* OpenAndCloseWindow.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = OpenAndCloseWindow.mm; sourceTree = "<group>"; };
CEA6CF2719CCF69D0064F5A7 /* open-and-close-window.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "open-and-close-window.html"; sourceTree = "<group>"; };
CEBABD481B71687C0051210A /* should-open-external-schemes.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "should-open-external-schemes.html"; sourceTree = "<group>"; };
@@ -1242,6 +1244,7 @@
0FC6C4CE141034AD005B7F0C /* MetaAllocator.cpp */,
93A427AC180DA60F00CD24D7 /* MoveOnly.h */,
FEB6F74E1B2BA44E009E4922 /* NakedPtr.cpp */,
+ CE50D8C81C8665CE0072EA5A /* OptionSet.cpp */,
1AFDE6541953B2C000C48FFA /* Optional.cpp */,
0FE447971B76F1E3009498EB /* ParkingLot.cpp */,
0FC6C4CB141027E0005B7F0C /* RedBlackTree.cpp */,
@@ -1850,6 +1853,7 @@
2D9A53AF1B31FA8D0074D5AA /* ShrinkToFit.mm in Sources */,
51B454EC1B4E236B0085EAA6 /* WebViewCloseInsideDidFinishLoadForFrame.mm in Sources */,
7AA021BB1AB09EA70052953F /* DateMath.cpp in Sources */,
+ CE50D8CA1C8665CE0072EA5A /* OptionSet.cpp in Sources */,
2D1FE0B01AD465C1006CD9E6 /* FixedLayoutSize.mm in Sources */,
1CB9BC381A67482300FE5678 /* WeakPtr.cpp in Sources */,
2E7765CD16C4D80A00BA2BB1 /* mainIOS.mm in Sources */,
Added: releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WTF/OptionSet.cpp (0 => 199353)
--- releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WTF/OptionSet.cpp (rev 0)
+++ releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WTF/OptionSet.cpp 2016-04-12 15:45:42 UTC (rev 199353)
@@ -0,0 +1,110 @@
+/*
+ * 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.
+ */
+
+#include "config.h"
+
+#include <wtf/OptionSet.h>
+
+namespace TestWebKitAPI {
+
+enum class ExampleFlags {
+ A = 1 << 0,
+ B = 1 << 1,
+ C = 1 << 2,
+};
+
+TEST(WTF_OptionSet, EmptySet)
+{
+ OptionSet<ExampleFlags> set;
+ EXPECT_FALSE(set.contains(ExampleFlags::A));
+ EXPECT_FALSE(set.contains(ExampleFlags::B));
+ EXPECT_FALSE(set.contains(ExampleFlags::C));
+}
+
+TEST(WTF_OptionSet, ContainsOneFlag)
+{
+ OptionSet<ExampleFlags> set = ExampleFlags::A;
+ EXPECT_TRUE(set.contains(ExampleFlags::A));
+ EXPECT_FALSE(set.contains(ExampleFlags::B));
+ EXPECT_FALSE(set.contains(ExampleFlags::C));
+}
+
+TEST(WTF_OptionSet, ContainsTwoFlags)
+{
+ OptionSet<ExampleFlags> set { ExampleFlags::A, ExampleFlags::B };
+ EXPECT_TRUE(set.contains(ExampleFlags::A));
+ EXPECT_TRUE(set.contains(ExampleFlags::B));
+ EXPECT_FALSE(set.contains(ExampleFlags::C));
+}
+
+TEST(WTF_OptionSet, OperatorBitwiseOr)
+{
+ OptionSet<ExampleFlags> set = ExampleFlags::A;
+ set |= ExampleFlags::C;
+ EXPECT_TRUE(set.contains(ExampleFlags::A));
+ EXPECT_FALSE(set.contains(ExampleFlags::B));
+ EXPECT_TRUE(set.contains(ExampleFlags::C));
+}
+
+TEST(WTF_OptionSet, EmptyOptionSetToRawValueToOptionSet)
+{
+ OptionSet<ExampleFlags> set;
+ EXPECT_FALSE(set.contains(ExampleFlags::A));
+ EXPECT_FALSE(set.contains(ExampleFlags::B));
+ EXPECT_FALSE(set.contains(ExampleFlags::C));
+
+ auto set2 = OptionSet<ExampleFlags>::fromRaw(set.toRaw());
+ EXPECT_FALSE(set2.contains(ExampleFlags::A));
+ EXPECT_FALSE(set2.contains(ExampleFlags::B));
+ EXPECT_FALSE(set2.contains(ExampleFlags::C));
+}
+
+TEST(WTF_OptionSet, OptionSetThatContainsOneFlagToRawValueToOptionSet)
+{
+ OptionSet<ExampleFlags> set = ExampleFlags::A;
+ EXPECT_TRUE(set.contains(ExampleFlags::A));
+ EXPECT_FALSE(set.contains(ExampleFlags::B));
+ EXPECT_FALSE(set.contains(ExampleFlags::C));
+
+ auto set2 = OptionSet<ExampleFlags>::fromRaw(set.toRaw());
+ EXPECT_TRUE(set2.contains(ExampleFlags::A));
+ EXPECT_FALSE(set2.contains(ExampleFlags::B));
+ EXPECT_FALSE(set2.contains(ExampleFlags::C));
+}
+
+TEST(WTF_OptionSet, OptionSetThatContainsTwoFlagsToRawValueToOptionSet)
+{
+ OptionSet<ExampleFlags> set { ExampleFlags::A, ExampleFlags::C };
+ EXPECT_TRUE(set.contains(ExampleFlags::A));
+ EXPECT_TRUE(set.contains(ExampleFlags::C));
+ EXPECT_FALSE(set.contains(ExampleFlags::B));
+
+ auto set2 = OptionSet<ExampleFlags>::fromRaw(set.toRaw());
+ EXPECT_TRUE(set2.contains(ExampleFlags::A));
+ EXPECT_TRUE(set2.contains(ExampleFlags::C));
+ EXPECT_FALSE(set2.contains(ExampleFlags::B));
+}
+
+} // namespace TestWebKitAPI
_______________________________________________ webkit-changes mailing list [email protected] https://lists.webkit.org/mailman/listinfo/webkit-changes
