Changeset 155357 in webkit for trunk/Source/JavaScriptCore/runtime

Timestamp:

Sep 9, 2013, 10:10:19 AM (12 years ago)

Author:

[email protected]

Message:

Begin moving off of TypeTraits.h
​https://bugs.webkit.org/show_bug.cgi?id=121006

Reviewed by Darin Adler.

Source/JavaScriptCore:

Convert uses of WTF type traits to STL type traits.

• heap/PassWeak.h:
• runtime/JSCell.h:

(JSC::jsCast):
(JSC::jsDynamicCast):

• runtime/WriteBarrier.h:

(JSC::validateCell):

Source/WebKit2:

Convert uses of WTF type traits to STL type traits.

• Platform/CoreIPC/ArgumentCoder.h:
• Platform/CoreIPC/ArgumentCoders.h:
• Platform/CoreIPC/ArgumentDecoder.h:
• Platform/CoreIPC/ArgumentEncoder.h:
• Platform/CoreIPC/Arguments.h:
• Shared/API/c/WKSharedAPICast.h:

(WebKit::toImpl):

Source/WTF:

The C++11 has its own type traits implementation that is more complete and handles corner cases better
since it ties into the compiler. Begin switching uses of WTF type traits to STL type traits.

• wtf/CheckedArithmetic.h:
• wtf/HashTraits.h:
• wtf/NeverDestroyed.h:
• wtf/OwnPtr.h:
• wtf/PassOwnPtr.h:

(WTF::adoptPtr):

• wtf/RetainPtr.h:

Location:

trunk/Source/JavaScriptCore/runtime

Files:

• JSCell.h (modified) (5 diffs)
• WriteBarrier.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSCell.h

@@ -32 +32 @@
 #include "WriteBarrier.h"
 #include <wtf/Noncopyable.h>
-#include <wtf/TypeTraits.h>
 
 namespace JSC {
@@ -179 +178 @@
 inline To jsCast(From* from)
 {
-    ASSERT(!from || from->JSCell::inherits(WTF::RemovePointer<To>::Type::info()));
+    ASSERT(!from || from->JSCell::inherits(std::remove_pointer<To>::type::info()));
     return static_cast<To>(from);
 }
@@ -186 +185 @@
 inline To jsCast(JSValue from)
 {
-    ASSERT(from.isCell() && from.asCell()->JSCell::inherits(WTF::RemovePointer<To>::Type::info()));
+    ASSERT(from.isCell() && from.asCell()->JSCell::inherits(std::remove_pointer<To>::type::info()));
     return static_cast<To>(from.asCell());
 }
@@ -193 +192 @@
 inline To jsDynamicCast(From* from)
 {
-    return from->inherits(WTF::RemovePointer<To>::Type::info()) ? static_cast<To>(from) : 0;
+    return from->inherits(std::remove_pointer<To>::type::info()) ? static_cast<To>(from) : 0;
 }
 
@@ -199 +198 @@
 inline To jsDynamicCast(JSValue from)
 {
-    return from.isCell() && from.asCell()->inherits(WTF::RemovePointer<To>::Type::info()) ? static_cast<To>(from.asCell()) : 0;
+    return from.isCell() && from.asCell()->inherits(std::remove_pointer<To>::type::info()) ? static_cast<To>(from.asCell()) : 0;
 }
 

trunk/Source/JavaScriptCore/runtime/WriteBarrier.h

@@ -31 +31 @@
 #include "Heap.h"
 #include "SamplingCounter.h"
-#include <wtf/TypeTraits.h>
 
 namespace JSC {
@@ -52 +51 @@
 template<class T> inline void validateCell(T cell)
 {
-    ASSERT_GC_OBJECT_INHERITS(cell, WTF::RemovePointer<T>::Type::info());
+    ASSERT_GC_OBJECT_INHERITS(cell, std::remove_pointer<T>::type::info());
 }