Index: third_party/WebKit/Source/platform/heap/ThreadingTraits.h |
diff --git a/third_party/WebKit/Source/platform/heap/ThreadingTraits.h b/third_party/WebKit/Source/platform/heap/ThreadingTraits.h |
index fef13ef6931856b060354f4f61ca2515afcb6d23..2657fefed7eed980200b5321c9ea8dda44f92103 100644 |
--- a/third_party/WebKit/Source/platform/heap/ThreadingTraits.h |
+++ b/third_party/WebKit/Source/platform/heap/ThreadingTraits.h |
@@ -35,8 +35,8 @@ class Node; |
class NodeList; |
template<typename T, |
- bool mainThreadOnly = WTF::IsSubclass<typename std::remove_const<T>::type, Node>::value |
- || WTF::IsSubclass<typename std::remove_const<T>::type, NodeList>::value> struct DefaultThreadingTrait; |
+ bool mainThreadOnly = std::is_convertible<typename std::remove_const<T>::type*, Node*>::value |
+ || std::is_convertible<typename std::remove_const<T>::type*, NodeList*>::value> struct DefaultThreadingTrait; |
Nico
2015/12/18 14:14:14
Now that I think about it, this is a risky change,
|
template<typename T> |
struct DefaultThreadingTrait<T, false> { |