| 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 266ae7d42269466de9bfab28e9cc7ddf3eaf6397..9a2b426847205eb845e6d2141bb80cb433d69e42 100644
|
| --- a/third_party/WebKit/Source/platform/TraceEvent.h
|
| +++ b/third_party/WebKit/Source/platform/TraceEvent.h
|
| @@ -390,7 +390,7 @@ template<typename T> struct ConvertableToTraceFormatTraits {
|
| };
|
|
|
| template<typename T> struct ConvertableToTraceFormatTraits<PassRefPtr<T>> {
|
| - static const bool isConvertable = WTF::IsSubclass<T, TraceEvent::ConvertableToTraceFormat>::value;
|
| + static const bool isConvertable = std::is_convertible<T*, TraceEvent::ConvertableToTraceFormat*>::value;
|
| static PassRefPtr<ConvertableToTraceFormat> moveFromIfConvertable(const PassRefPtr<T>& convertableToTraceFormat)
|
| {
|
| return convertableToTraceFormat;
|
|
|