| 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 20b6b7bc17caaa5fd2bf686401dbbb25811e5311..2bc6c4c102360c33b2e4732356216ddb8ca1c90a 100644
|
| --- a/third_party/WebKit/Source/platform/TraceEvent.h
|
| +++ b/third_party/WebKit/Source/platform/TraceEvent.h
|
| @@ -384,7 +384,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;
|
|
|