| Index: third_party/WebKit/Source/platform/TraceEvent.h
|
| diff --git a/third_party/WebKit/Source/platform/TraceEvent.h b/third_party/WebKit/Source/platform/TraceEvent.h
|
| index c47ac9bb57e52b101515b5984d04796826fe0919..da2211456307987ff837a477d065218d8f53ac7a 100644
|
| --- a/third_party/WebKit/Source/platform/TraceEvent.h
|
| +++ b/third_party/WebKit/Source/platform/TraceEvent.h
|
| @@ -442,9 +442,9 @@ template<typename T> struct TracedValueTraits {
|
|
|
| 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);
|
| }
|
| };
|
|
|
| @@ -453,9 +453,9 @@ 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
|
|
|