Changeset 155402 in webkit
- Timestamp:
- Sep 9, 2013, 4:37:43 PM (13 years ago)
- Location:
- trunk/Source
- Files:
-
- 2 deleted
- 13 edited
-
JavaScriptCore/jsc.cpp (modified) (1 diff)
-
JavaScriptCore/testRegExp.cpp (modified) (1 diff)
-
WTF/ChangeLog (modified) (1 diff)
-
WTF/GNUmakefile.list.am (modified) (1 diff)
-
WTF/WTF.pro (modified) (2 diffs)
-
WTF/WTF.vcxproj/WTF.vcxproj (modified) (2 diffs)
-
WTF/WTF.vcxproj/WTF.vcxproj.filters (modified) (2 diffs)
-
WTF/WTF.xcodeproj/project.pbxproj (modified) (5 diffs)
-
WTF/wtf/CMakeLists.txt (modified) (2 diffs)
-
WTF/wtf/TypeTraits.cpp (deleted)
-
WTF/wtf/TypeTraits.h (deleted)
-
WTF/wtf/VectorTraits.h (modified) (3 diffs)
-
WebCore/platform/CrossThreadCopier.cpp (modified) (6 diffs)
-
WebKit2/Platform/CoreIPC/ArgumentCoders.h (modified) (1 diff)
-
WebKit2/Platform/CoreIPC/ArgumentDecoder.h (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/jsc.cpp
r155239 r155402 262 262 }; 263 263 264 COMPILE_ASSERT(!IsInteger<GlobalObject>::value, WTF_IsInteger_GlobalObject_false);265 266 264 const ClassInfo GlobalObject::s_info = { "global", &JSGlobalObject::s_info, 0, ExecState::globalObjectTable, CREATE_METHOD_TABLE(GlobalObject) }; 267 265 const GlobalObjectMethodTable GlobalObject::s_globalObjectMethodTable = { &allowsAccessFrom, &supportsProfiling, &supportsRichSourceInfo, &shouldInterruptScript, &javaScriptExperimentsEnabled, 0 }; -
trunk/Source/JavaScriptCore/testRegExp.cpp
r154038 r155402 139 139 } 140 140 }; 141 142 COMPILE_ASSERT(!IsInteger<GlobalObject>::value, WTF_IsInteger_GlobalObject_false);143 141 144 142 const ClassInfo GlobalObject::s_info = { "global", &JSGlobalObject::s_info, 0, ExecState::globalObjectTable, CREATE_METHOD_TABLE(GlobalObject) }; -
trunk/Source/WTF/ChangeLog
r155360 r155402 1 2013-09-09 Anders Carlsson <andersca@apple.com> 2 3 Remove wtf/TypeTraits.h 4 https://bugs.webkit.org/show_bug.cgi?id=121047 5 6 Reviewed by Darin Adler. 7 8 * GNUmakefile.list.am: 9 * WTF.pro: 10 * WTF.vcxproj/WTF.vcxproj: 11 * WTF.vcxproj/WTF.vcxproj.filters: 12 * WTF.xcodeproj/project.pbxproj: 13 * wtf/CMakeLists.txt: 14 * wtf/TypeTraits.cpp: Removed. 15 * wtf/TypeTraits.h: Removed. 16 * wtf/VectorTraits.h: 17 1 18 2013-09-09 Luciano Wolf <luciano.wolf@openbossa.org> 2 19 -
trunk/Source/WTF/GNUmakefile.list.am
r155308 r155402 179 179 Source/WTF/wtf/ThreadingWin.cpp \ 180 180 Source/WTF/wtf/TriState.h \ 181 Source/WTF/wtf/TypeTraits.cpp \182 Source/WTF/wtf/TypeTraits.h \183 181 Source/WTF/wtf/UnionFind.h \ 184 182 Source/WTF/wtf/UniStdExtras.h \ -
trunk/Source/WTF/WTF.pro
r155338 r155402 155 155 ThreadSafeRefCounted.h \ 156 156 ThreadSpecific.h \ 157 TypeTraits.h \158 157 unicode/CharacterNames.h \ 159 158 unicode/Collator.h \ … … 221 220 TCSystemAlloc.cpp \ 222 221 Threading.cpp \ 223 TypeTraits.cpp \224 222 WTFThreadData.cpp \ 225 223 text/AtomicString.cpp \ -
trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj
r155308 r155402 110 110 <ClCompile Include="..\wtf\threads\BinarySemaphore.cpp" /> 111 111 <ClCompile Include="..\wtf\threads\win\BinarySemaphoreWin.cpp" /> 112 <ClCompile Include="..\wtf\TypeTraits.cpp" />113 112 <ClCompile Include="..\wtf\unicode\icu\CollatorICU.cpp" /> 114 113 <ClCompile Include="..\wtf\unicode\UTF8.cpp" /> … … 262 261 <ClInclude Include="..\wtf\threadspecific.h" /> 263 262 <ClInclude Include="..\wtf\threads\BinarySemaphore.h" /> 264 <ClInclude Include="..\wtf\TypeTraits.h" />265 263 <ClInclude Include="..\wtf\unicode\CharacterNames.h" /> 266 264 <ClInclude Include="..\wtf\unicode\Collator.h" /> -
trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters
r155308 r155402 199 199 <Filter>wtf</Filter> 200 200 </ClCompile> 201 <ClCompile Include="..\wtf\TypeTraits.cpp">202 <Filter>wtf</Filter>203 </ClCompile>204 201 <ClCompile Include="..\wtf\WTFThreadData.cpp"> 205 202 <Filter>wtf</Filter> … … 646 643 </ClInclude> 647 644 <ClInclude Include="..\wtf\ThreadRestrictionVerifier.h"> 648 <Filter>wtf</Filter>649 </ClInclude>650 <ClInclude Include="..\wtf\TypeTraits.h">651 645 <Filter>wtf</Filter> 652 646 </ClInclude> -
trunk/Source/WTF/WTF.xcodeproj/project.pbxproj
r155308 r155402 244 244 A8A47454151A825B004123FF /* ThreadSafeRefCounted.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4733E151A825B004123FF /* ThreadSafeRefCounted.h */; }; 245 245 A8A47455151A825B004123FF /* ThreadSpecific.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4733F151A825B004123FF /* ThreadSpecific.h */; }; 246 A8A47458151A825B004123FF /* TypeTraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8A47342151A825B004123FF /* TypeTraits.cpp */; };247 A8A47459151A825B004123FF /* TypeTraits.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47343151A825B004123FF /* TypeTraits.h */; };248 246 A8A4745E151A825B004123FF /* CharacterNames.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A47349151A825B004123FF /* CharacterNames.h */; }; 249 247 A8A4745F151A825B004123FF /* Collator.h in Headers */ = {isa = PBXBuildFile; fileRef = A8A4734A151A825B004123FF /* Collator.h */; }; … … 517 515 A8A4733E151A825B004123FF /* ThreadSafeRefCounted.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadSafeRefCounted.h; sourceTree = "<group>"; }; 518 516 A8A4733F151A825B004123FF /* ThreadSpecific.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadSpecific.h; sourceTree = "<group>"; }; 519 A8A47342151A825B004123FF /* TypeTraits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TypeTraits.cpp; sourceTree = "<group>"; };520 A8A47343151A825B004123FF /* TypeTraits.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TypeTraits.h; sourceTree = "<group>"; };521 517 A8A47349151A825B004123FF /* CharacterNames.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterNames.h; sourceTree = "<group>"; }; 522 518 A8A4734A151A825B004123FF /* Collator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Collator.h; sourceTree = "<group>"; }; … … 794 790 A8A4733F151A825B004123FF /* ThreadSpecific.h */, 795 791 149EF16216BBFE0D000A4331 /* TriState.h */, 796 A8A47342151A825B004123FF /* TypeTraits.cpp */,797 A8A47343151A825B004123FF /* TypeTraits.h */,798 792 A8A4735C151A825B004123FF /* UnionFind.h */, 799 793 A8A4736F151A825B004123FF /* ValueCheck.h */, … … 1082 1076 A8A47455151A825B004123FF /* ThreadSpecific.h in Headers */, 1083 1077 149EF16316BBFE0D000A4331 /* TriState.h in Headers */, 1084 A8A47459151A825B004123FF /* TypeTraits.h in Headers */,1085 1078 A8A47467151A825B004123FF /* Unicode.h in Headers */, 1086 1079 A8A47464151A825B004123FF /* UnicodeIcu.h in Headers */, … … 1232 1225 A8A4744A151A825B004123FF /* Threading.cpp in Sources */, 1233 1226 A8A4744E151A825B004123FF /* ThreadingPthreads.cpp in Sources */, 1234 A8A47458151A825B004123FF /* TypeTraits.cpp in Sources */,1235 1227 A8A47469151A825B004123FF /* UTF8.cpp in Sources */, 1236 1228 1FA47C8A152502DA00568D1B /* WebCoreThread.cpp in Sources */, -
trunk/Source/WTF/wtf/CMakeLists.txt
r155308 r155402 107 107 Threading.h 108 108 ThreadingPrimitives.h 109 TypeTraits.h110 109 VMTags.h 111 110 ValueCheck.h … … 183 182 TCSystemAlloc.cpp 184 183 Threading.cpp 185 TypeTraits.cpp186 184 WTFThreadData.cpp 187 185 dtoa.cpp -
trunk/Source/WTF/wtf/VectorTraits.h
r154997 r155402 26 26 #include <wtf/Ref.h> 27 27 #include <wtf/RefPtr.h> 28 #include <wtf/TypeTraits.h>29 28 #include <utility> 30 29 #include <memory> … … 64 63 65 64 template<typename T> 66 struct VectorTraits : VectorTraitsBase< IsPod<T>::value, T> { };65 struct VectorTraits : VectorTraitsBase<std::is_pod<T>::value, T> { }; 67 66 68 67 struct SimpleClassVectorTraits : VectorTraitsBase<false, void> … … 91 90 92 91 template<typename First, typename Second> 93 struct VectorTraits< pair<First, Second> >92 struct VectorTraits<std::pair<First, Second> > 94 93 { 95 94 typedef VectorTraits<First> FirstTraits; -
trunk/Source/WebCore/platform/CrossThreadCopier.cpp
r127757 r155402 74 74 }; 75 75 76 COMPILE_ASSERT(( WTF::IsSameType<76 COMPILE_ASSERT((std::is_same< 77 77 PassRefPtr<CopierThreadSafeRefCountedTest>, 78 78 CrossThreadCopier<PassRefPtr<CopierThreadSafeRefCountedTest> >::Type 79 79 >::value), 80 80 PassRefPtrTest); 81 COMPILE_ASSERT(( WTF::IsSameType<81 COMPILE_ASSERT((std::is_same< 82 82 PassRefPtr<CopierThreadSafeRefCountedTest>, 83 83 CrossThreadCopier<RefPtr<CopierThreadSafeRefCountedTest> >::Type 84 84 >::value), 85 85 RefPtrTest); 86 COMPILE_ASSERT(( WTF::IsSameType<86 COMPILE_ASSERT((std::is_same< 87 87 PassRefPtr<CopierThreadSafeRefCountedTest>, 88 88 CrossThreadCopier<CopierThreadSafeRefCountedTest*>::Type … … 100 100 }; 101 101 102 COMPILE_ASSERT(( WTF::IsSameType<102 COMPILE_ASSERT((std::is_same< 103 103 int, 104 104 CrossThreadCopier<PassRefPtr<CopierRefCountedTest> >::Type … … 106 106 PassRefPtrRefCountedTest); 107 107 108 COMPILE_ASSERT(( WTF::IsSameType<108 COMPILE_ASSERT((std::is_same< 109 109 int, 110 110 CrossThreadCopier<RefPtr<CopierRefCountedTest> >::Type … … 112 112 RefPtrRefCountedTest); 113 113 114 COMPILE_ASSERT(( WTF::IsSameType<114 COMPILE_ASSERT((std::is_same< 115 115 int, 116 116 CrossThreadCopier<CopierRefCountedTest*>::Type … … 119 119 120 120 // Verify that PassOwnPtr gets passed through. 121 COMPILE_ASSERT(( WTF::IsSameType<121 COMPILE_ASSERT((std::is_same< 122 122 PassOwnPtr<float>, 123 123 CrossThreadCopier<PassOwnPtr<float> >::Type … … 126 126 127 127 // Verify that PassOwnPtr does not get passed through. 128 COMPILE_ASSERT(( WTF::IsSameType<128 COMPILE_ASSERT((std::is_same< 129 129 int, 130 130 CrossThreadCopier<OwnPtr<float> >::Type -
trunk/Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h
r155357 r155402 155 155 }; 156 156 157 template<typename T> struct ArgumentCoder<Vector<T>> : VectorArgumentCoder< WTF::IsArithmetic<T>::value, T> { };157 template<typename T> struct ArgumentCoder<Vector<T>> : VectorArgumentCoder<std::is_arithmetic<T>::value, T> { }; 158 158 159 159 template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg> struct ArgumentCoder<HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>> { -
trunk/Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h
r155357 r155402 64 64 template<typename T> bool decodeEnum(T& result) 65 65 { 66 COMPILE_ASSERT(sizeof(T) <= sizeof(uint64_t), enum_type_must_not_be_larger_than_64_bits);66 static_assert(sizeof(T) <= 8, "Enum type T must not be larger than 64 bits!"); 67 67 68 68 uint64_t value; … … 77 77 bool bufferIsLargeEnoughToContain(size_t numElements) const 78 78 { 79 COMPILE_ASSERT(WTF::IsArithmetic<T>::value, type_must_have_known_encoded_size);80 79 static_assert(std::is_arithmetic<T>::value, "Type T must have a fixed, known encoded size!"); 80 81 81 if (numElements > std::numeric_limits<size_t>::max() / sizeof(T)) 82 82 return false;
Note:
See TracChangeset
for help on using the changeset viewer.