Prepare for move-only PassOwnPtr in the remaining directories.

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 424 matching lines @@
 template<typename T> struct TracedValueTraits {
     static const bool isTracedValue = false;
     static PassOwnPtr<TracedValue> moveFromIfTracedValue(const T&)
     {
         return nullptr;
     }
 };
 
 template<typename T> struct TracedValueTraits<PassOwnPtr<T>> {
     static const bool isTracedValue = std::is_convertible<T*, TracedValue*>::value;
-    static PassOwnPtr<TracedValue> moveFromIfTracedValue(const PassOwnPtr<T>& tracedValue)
+    static PassOwnPtr<TracedValue> moveFromIfTracedValue(PassOwnPtr<T>&& tracedValue)
     {
-        return tracedValue;
+        return std::move(tracedValue);
     }
 };
 
 template<typename T> bool isTracedValue(const T&)
 {
     return TracedValueTraits<T>::isTracedValue;
 }
 
-template<typename T> PassOwnPtr<TracedValue> moveFromIfTracedValue(const T& value)
+template<typename T> PassOwnPtr<TracedValue> moveFromIfTracedValue(T&& value)
 {
-    return TracedValueTraits<T>::moveFromIfTracedValue(value);
+    return TracedValueTraits<T>::moveFromIfTracedValue(std::forward<T>(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 14 matching lines @@
 static inline TraceEventHandle addTraceEvent(
     char phase,
     const unsigned char* categoryEnabled,
     const char* name,
     const char* scope,
     unsigned long long id,
     unsigned long long bindId,
     double timestamp,
     unsigned flags,
     const char* arg1Name,
-    const ARG1_TYPE& arg1Val)
+    ARG1_TYPE&& arg1Val)
 {
     const int numArgs = 1;
     unsigned char argTypes[1];
     unsigned long long argValues[1];
     setTraceValue(arg1Val, &argTypes[0], &argValues[0]);
     if (isTracedValue(arg1Val)) {
         return TRACE_EVENT_API_ADD_TRACE_EVENT(
             phase, categoryEnabled, name, scope, id, bindId, timestamp,
             numArgs, &arg1Name, argTypes, argValues,
-            moveFromIfTracedValue(arg1Val),
+            moveFromIfTracedValue(std::forward<ARG1_TYPE>(arg1Val)),
             nullptr,
             flags);
     }
     return TRACE_EVENT_API_ADD_TRACE_EVENT(
         phase, categoryEnabled, name, scope, 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,
     const char* scope,
     unsigned long long id,
     unsigned long long bindId,
     double timestamp,
     unsigned flags,
     const char* arg1Name,
-    const ARG1_TYPE& arg1Val,
+    ARG1_TYPE&& arg1Val,
     const char* arg2Name,
-    const ARG2_TYPE& arg2Val)
+    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 (isTracedValue(arg1Val) || isTracedValue(arg2Val)) {
         return TRACE_EVENT_API_ADD_TRACE_EVENT(
             phase, categoryEnabled, name, scope, id, bindId, timestamp,
             numArgs, argNames, argTypes, argValues,
-            moveFromIfTracedValue(arg1Val),
-            moveFromIfTracedValue(arg2Val),
+            moveFromIfTracedValue(std::forward<ARG1_TYPE>(arg1Val)),
+            moveFromIfTracedValue(std::forward<ARG2_TYPE>(arg2Val)),
             flags);
     }
     return TRACE_EVENT_API_ADD_TRACE_EVENT(
         phase, categoryEnabled, name, scope, id, bindId, timestamp,
         numArgs, argNames, argTypes, argValues,
         flags);
 }
 
 static inline TraceEventHandle addTraceEvent(
     char phase,
     const unsigned char* categoryEnabled,
     const char* name,
     const char* scope,
     unsigned long long id,
     unsigned flags)
 {
     return addTraceEvent(phase, categoryEnabled, name, scope, id,
         blink::TraceEvent::noBindId, EventTracer::systemTraceTime(), flags);
 }
 
 template<typename ARG1_TYPE>
 static inline TraceEventHandle addTraceEvent(
     char phase,
     const unsigned char* categoryEnabled,
     const char* name,
     const char* scope,
     unsigned long long id,
     unsigned flags,
     const char* arg1Name,
-    const ARG1_TYPE& arg1Val)
+    ARG1_TYPE&& arg1Val)
 {
     return addTraceEvent(phase, categoryEnabled, name, scope, id,
         blink::TraceEvent::noBindId, EventTracer::systemTraceTime(), flags,
-        arg1Name, arg1Val);
+        arg1Name, std::forward<ARG1_TYPE>(arg1Val));
 }
 
 
 template<typename ARG1_TYPE, typename ARG2_TYPE>
 static inline TraceEventHandle addTraceEvent(
     char phase,
     const unsigned char* categoryEnabled,
     const char* name,
     const char* scope,
     unsigned long long id,
     unsigned flags,
     const char* arg1Name,
-    const ARG1_TYPE& arg1Val,
+    ARG1_TYPE&& arg1Val,
     const char* arg2Name,
-    const ARG2_TYPE& arg2Val)
+    ARG2_TYPE&& arg2Val)
 {
     return addTraceEvent(phase, categoryEnabled, name, scope, id,
         blink::TraceEvent::noBindId, EventTracer::systemTraceTime(), flags,
-        arg1Name, arg1Val, arg2Name, arg2Val);
+        arg1Name, std::forward<ARG1_TYPE>(arg1Val),
+        arg2Name, std::forward<ARG2_TYPE>(arg2Val));
 }
 
 // Used by TRACE_EVENTx macro. Do not use directly.
 class ScopedTracer final {
     STACK_ALLOCATED();
     WTF_MAKE_NONCOPYABLE(ScopedTracer);
 public:
     // Note: members of m_data intentionally left uninitialized. See initialize.
     ScopedTracer() : m_pdata(0) { }
     ~ScopedTracer()
@@ skipping 78 matching lines @@
     const char* m_categoryGroup;
     const char* m_name;
     IDType m_id;
 };
 
 } // namespace TraceEvent
 
 } // namespace blink
 
 #endif