Move TraceEvent.h from platform/ to wtf/

Source/wtf/TraceEvent.h

Index: Source/wtf/TraceEvent.h
diff --git a/Source/platform/TraceEvent.h b/Source/wtf/TraceEvent.h
similarity index 97%
rename from Source/platform/TraceEvent.h
rename to Source/wtf/TraceEvent.h
index 61ad65e2d2aabdb29634fb8b857fd5c3f6c8df81..b190bfecafada5923400bcfcc22b884089c5f97a 100644
--- a/Source/platform/TraceEvent.h
+++ b/Source/wtf/TraceEvent.h
@@ -164,7 +164,6 @@
 #define TraceEvent_h
 
 #include "platform/EventTracer.h"

[haraken, 2014/03/21 17:10:18]

Unfortunately this CL doesn't work because of this include: wtf/TraceEvent.h
needs to include platform/EventTracer.h...

- TraceEvent somehow needs to interact with platform APIs, which means that
TraceEvent depends on platform/, which means that TraceEvent cannot be put into
wtf/.

- We want to use TraceEvent in heap/, which means that TraceEvent should be put
into wtf/.

Do you have any idea to address this issue? One possible approach would be to
keep TraceEvent in platform/ and pass a function pointer to heap/ so that heap/
can use TraceEvent. But it's ugly.

-
 #include "wtf/DynamicAnnotations.h"
 #include "wtf/text/CString.h"
 
@@ -569,7 +568,7 @@
 #define INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category) \
     static const unsigned char* INTERNALTRACEEVENTUID(categoryGroupEnabled) = 0; \
     WTF_ANNOTATE_BENIGN_RACE(&INTERNALTRACEEVENTUID(categoryGroupEnabled), \
-                             "trace_event category"); \
+        "trace_event category"); \
     if (!INTERNALTRACEEVENTUID(categoryGroupEnabled)) { \
         INTERNALTRACEEVENTUID(categoryGroupEnabled) = \
             TRACE_EVENT_API_GET_CATEGORY_ENABLED(category); \
@@ -606,8 +605,7 @@
 
 // Implementation detail: internal macro to create static category and add
 // event if the category is enabled.
-#define INTERNAL_TRACE_EVENT_ADD_WITH_ID(phase, category, name, id, flags, \
-                                         ...) \
+#define INTERNAL_TRACE_EVENT_ADD_WITH_ID(phase, category, name, id, flags, ...) \
     do { \
         INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(category); \
         if (INTERNAL_TRACE_EVENT_CATEGORY_GROUP_ENABLED_FOR_RECORDING_MODE()) { \
@@ -616,8 +614,7 @@
                 id, &traceEventFlags); \
             WebCore::TraceEvent::addTraceEvent( \
                 phase, INTERNALTRACEEVENTUID(categoryGroupEnabled), \
-                name, traceEventTraceID.data(), traceEventFlags, \
-                ##__VA_ARGS__); \
+                name, traceEventTraceID.data(), traceEventFlags, ##__VA_ARGS__); \
         } \
     } while (0)
 
@@ -743,29 +740,22 @@ private:
 // Define setTraceValue for each allowed type. It stores the type and
 // value in the return arguments. This allows this API to avoid declaring any
 // structures so that it is portable to third_party libraries.
-#define INTERNAL_DECLARE_SET_TRACE_VALUE(actual_type, \
-                                         union_member, \
-                                         value_type_id) \
-    static inline void setTraceValue(actual_type arg, \
-                                     unsigned char* type, \
-                                     unsigned long long* value) { \
+#define INTERNAL_DECLARE_SET_TRACE_VALUE(actual_type, union_member, value_type_id) \
+    static inline void setTraceValue(actual_type arg, unsigned char* type, unsigned long long* value) { \
         TraceValueUnion typeValue; \
         typeValue.union_member = arg; \
         *type = value_type_id; \
         *value = typeValue.m_uint; \
     }
 // Simpler form for int types that can be safely casted.
-#define INTERNAL_DECLARE_SET_TRACE_VALUE_INT(actual_type, \
-                                             value_type_id) \
-    static inline void setTraceValue(actual_type arg, \
-                                     unsigned char* type, \
-                                     unsigned long long* value) { \
+#define INTERNAL_DECLARE_SET_TRACE_VALUE_INT(actual_type, value_type_id) \
+    static inline void setTraceValue(actual_type arg, unsigned char* type, unsigned long long* value) { \
         *type = value_type_id; \
         *value = static_cast<unsigned long long>(arg); \
     }
 
 INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned long long, TRACE_VALUE_TYPE_UINT)
-INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned int, TRACE_VALUE_TYPE_UINT)
+INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned, TRACE_VALUE_TYPE_UINT)
 INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned short, TRACE_VALUE_TYPE_UINT)
 INTERNAL_DECLARE_SET_TRACE_VALUE_INT(unsigned char, TRACE_VALUE_TYPE_UINT)
 INTERNAL_DECLARE_SET_TRACE_VALUE_INT(long long, TRACE_VALUE_TYPE_INT)
@@ -774,12 +764,9 @@ INTERNAL_DECLARE_SET_TRACE_VALUE_INT(short, TRACE_VALUE_TYPE_INT)
 INTERNAL_DECLARE_SET_TRACE_VALUE_INT(signed char, TRACE_VALUE_TYPE_INT)
 INTERNAL_DECLARE_SET_TRACE_VALUE(bool, m_bool, TRACE_VALUE_TYPE_BOOL)
 INTERNAL_DECLARE_SET_TRACE_VALUE(double, m_double, TRACE_VALUE_TYPE_DOUBLE)
-INTERNAL_DECLARE_SET_TRACE_VALUE(const void*, m_pointer,
-                                 TRACE_VALUE_TYPE_POINTER)
-INTERNAL_DECLARE_SET_TRACE_VALUE(const char*, m_string,
-                                 TRACE_VALUE_TYPE_STRING)
-INTERNAL_DECLARE_SET_TRACE_VALUE(const TraceStringWithCopy&, m_string,
-                                 TRACE_VALUE_TYPE_COPY_STRING)
+INTERNAL_DECLARE_SET_TRACE_VALUE(const void*, m_pointer, TRACE_VALUE_TYPE_POINTER)
+INTERNAL_DECLARE_SET_TRACE_VALUE(const char*, m_string, TRACE_VALUE_TYPE_STRING)
+INTERNAL_DECLARE_SET_TRACE_VALUE(const TraceStringWithCopy&, m_string, TRACE_VALUE_TYPE_COPY_STRING)
 
 #undef INTERNAL_DECLARE_SET_TRACE_VALUE
 #undef INTERNAL_DECLARE_SET_TRACE_VALUE_INT