Remove Blink's ConvertableToTraceFormat

third_party/WebKit/Source/platform/TraceEvent.h

 /*
  * Copyright (C) 2011 Google 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
@@ skipping 15 matching lines @@
 // This header file defines implementation details of how the trace macros in
 // TraceEventCommon.h collect and store trace events. Anything not
 // implementation-specific should go in TraceEventCommon.h instead of here.
 
 #ifndef TraceEvent_h
 #define TraceEvent_h
 
 #include "platform/EventTracer.h"
 #include "platform/TraceEventCommon.h"
 
+#include "platform/TracedValue.h"
 #include "wtf/Allocator.h"
 #include "wtf/DynamicAnnotations.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/text/CString.h"
 
 ////////////////////////////////////////////////////////////////////////////////
 // Implementation specific tracing API definitions.
 
 // By default, const char* argument values are assumed to have long-lived scope
@@ skipping 57 matching lines @@
 
 // Add a trace event to the platform tracing system.
 // blink::TraceEvent::TraceEventHandle TRACE_EVENT_API_ADD_TRACE_EVENT(
 //                    const char* name,
 //                    unsigned long long id,
 //                    double timestamp,
 //                    int num_args,
 //                    const char** arg_names,
 //                    const unsigned char* arg_types,
 //                    const unsigned long long* arg_values,
-//                    PassRefPtr<ConvertableToTraceFormat> convertableValues[],
+//                    PassRefPtr<TracedValue> convertableValues[],

[yhirano, 2016/01/29 05:44:29]

nit: "convertable" not needed?

[bashi, 2016/01/29 06:01:01]

Done. Also renamed moveFromIfConvertable().

 //                    unsigned char flags)
 #define TRACE_EVENT_API_ADD_TRACE_EVENT \
     blink::EventTracer::addTraceEvent
 
 // Set the duration field of a COMPLETE trace event.
 // void TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION(
 //     blink::TraceEvent::TraceEventHandle handle)
 #define TRACE_EVENT_API_UPDATE_TRACE_EVENT_DURATION \
     blink::EventTracer::updateTraceEventDuration
 
@@ skipping 243 matching lines @@
 
 // WTF::String version of setTraceValue so that trace arguments can be strings.
 static inline void setTraceValue(const WTF::CString& arg, unsigned char* type, unsigned long long* value)
 {
     TraceValueUnion typeValue;
     typeValue.m_string = arg.data();
     *type = TRACE_VALUE_TYPE_COPY_STRING;
     *value = typeValue.m_uint;
 }
 
-static inline void setTraceValue(ConvertableToTraceFormat*, unsigned char* type, unsigned long long*)
+static inline void setTraceValue(TracedValue*, unsigned char* type, unsigned long long*)
 {
     *type = TRACE_VALUE_TYPE_CONVERTABLE;
 }
 
 template<typename T> static inline void setTraceValue(const PassRefPtr<T>& ptr, unsigned char* type, unsigned long long* value)
 {
     setTraceValue(ptr.get(), type, value);
 }
 
-template<typename T> struct ConvertableToTraceFormatTraits {
-    static const bool isConvertable = false;
-    static PassRefPtr<ConvertableToTraceFormat> moveFromIfConvertable(const T&)
+template<typename T> struct TracedValueTraits {
+    static const bool isTracedValue = false;
+    static PassRefPtr<TracedValue> moveFromIfConvertable(const T&)
     {
         return nullptr;
     }
 };
 
-template<typename T> struct ConvertableToTraceFormatTraits<PassRefPtr<T>> {
-    static const bool isConvertable = std::is_convertible<T*, TraceEvent::ConvertableToTraceFormat*>::value;
-    static PassRefPtr<ConvertableToTraceFormat> moveFromIfConvertable(const PassRefPtr<T>& convertableToTraceFormat)
+template<typename T> struct TracedValueTraits<PassRefPtr<T>> {
+    static const bool isTracedValue = std::is_convertible<T*, TracedValue*>::value;
+    static PassRefPtr<TracedValue> moveFromIfConvertable(const PassRefPtr<T>& convertableToTraceFormat)
     {
         return convertableToTraceFormat;
     }
 };
 
-template<typename T> bool isConvertableToTraceFormat(const T&)
+template<typename T> bool isTracedValue(const T&)
 {
-    return ConvertableToTraceFormatTraits<T>::isConvertable;
+    return TracedValueTraits<T>::isTracedValue;
 }
 
-template<typename T> PassRefPtr<ConvertableToTraceFormat> moveFromIfConvertableToTraceFormat(const T& value)
+template<typename T> PassRefPtr<TracedValue> moveFromIfTracedValue(const T& value)
 {
-    return ConvertableToTraceFormatTraits<T>::moveFromIfConvertable(value);
+    return TracedValueTraits<T>::moveFromIfConvertable(value);
 }
 
 // These addTraceEvent template functions are defined here instead of in the
 // macro, because the arg values could be temporary string objects. In order to
 // store pointers to the internal c_str and pass through to the tracing API, the
 // arg values must live throughout these procedures.
 
 static inline TraceEventHandle addTraceEvent(
     char phase,
     const unsigned char* categoryEnabled,
@@ skipping 18 matching lines @@
     unsigned long long bindId,
     double timestamp,
     unsigned flags,
     const char* arg1Name,
     const ARG1_TYPE& arg1Val)
 {
     const int numArgs = 1;
     unsigned char argTypes[1];
     unsigned long long argValues[1];
     setTraceValue(arg1Val, &argTypes[0], &argValues[0]);
-    if (isConvertableToTraceFormat(arg1Val)) {
+    if (isTracedValue(arg1Val)) {
         return TRACE_EVENT_API_ADD_TRACE_EVENT(
             phase, categoryEnabled, name, id, bindId, timestamp,
             numArgs, &arg1Name, argTypes, argValues,
-            moveFromIfConvertableToTraceFormat(arg1Val),
+            moveFromIfTracedValue(arg1Val),
             nullptr,
             flags);
     }
     return TRACE_EVENT_API_ADD_TRACE_EVENT(
         phase, categoryEnabled, name, id, bindId, timestamp,
         numArgs, &arg1Name, argTypes, argValues,
         flags);
 }
 
 template<typename ARG1_TYPE, typename ARG2_TYPE>
 static inline TraceEventHandle addTraceEvent(
     char phase,
     const unsigned char* categoryEnabled,
     const char* name,
     unsigned long long id,
     unsigned long long bindId,
     double timestamp,
     unsigned flags,
     const char* arg1Name,
     const ARG1_TYPE& arg1Val,
     const char* arg2Name,
     const ARG2_TYPE& arg2Val)
 {
     const int numArgs = 2;
     const char* argNames[2] = { arg1Name, arg2Name };
     unsigned char argTypes[2];
     unsigned long long argValues[2];
     setTraceValue(arg1Val, &argTypes[0], &argValues[0]);
     setTraceValue(arg2Val, &argTypes[1], &argValues[1]);
-    if (isConvertableToTraceFormat(arg1Val) || isConvertableToTraceFormat(arg2Val)) {
+    if (isTracedValue(arg1Val) || isTracedValue(arg2Val)) {
         return TRACE_EVENT_API_ADD_TRACE_EVENT(
             phase, categoryEnabled, name, id, bindId, timestamp,
             numArgs, argNames, argTypes, argValues,
-            moveFromIfConvertableToTraceFormat(arg1Val),
-            moveFromIfConvertableToTraceFormat(arg2Val),
+            moveFromIfTracedValue(arg1Val),
+            moveFromIfTracedValue(arg2Val),
             flags);
     }
     return TRACE_EVENT_API_ADD_TRACE_EVENT(
         phase, categoryEnabled, name, id, bindId, timestamp,
         numArgs, argNames, argTypes, argValues,
         flags);
 }
 
 static inline TraceEventHandle addTraceEvent(
     char phase,
@@ skipping 151 matching lines @@
     const char* m_categoryGroup;
     const char* m_name;
     TraceContext m_context;
 };
 
 } // namespace TraceEvent
 
 } // namespace blink
 
 #endif