| Index: third_party/WebKit/Source/platform/heap/TraceTraits.h
|
| diff --git a/third_party/WebKit/Source/platform/heap/TraceTraits.h b/third_party/WebKit/Source/platform/heap/TraceTraits.h
|
| index e03a14a769155315ec4dbe016e46cd889f814518..7d35c325acb544a1860b0aaa922bef272802666e 100644
|
| --- a/third_party/WebKit/Source/platform/heap/TraceTraits.h
|
| +++ b/third_party/WebKit/Source/platform/heap/TraceTraits.h
|
| @@ -385,7 +385,7 @@ struct TraceInCollectionTrait<NoWeakHandlingInCollections, strongify, blink::Hea
|
| // This is fine because the fact that the object can be initialized
|
| // with memset indicates that it is safe to treat the zerod slot
|
| // as a valid object.
|
| - static_assert(!NeedsTracingTrait<Traits>::value || Traits::canClearUnusedSlotsWithMemset || WTF::IsPolymorphic<T>::value, "HeapVectorBacking doesn't support objects that cannot be cleared as unused with memset.");
|
| + static_assert(!NeedsTracingTrait<Traits>::value || Traits::canClearUnusedSlotsWithMemset || std::is_polymorphic<T>::value, "HeapVectorBacking doesn't support objects that cannot be cleared as unused with memset.");
|
|
|
| // This trace method is instantiated for vectors where
|
| // NeedsTracingTrait<Traits>::value is false, but the trace method
|
| @@ -399,7 +399,7 @@ struct TraceInCollectionTrait<NoWeakHandlingInCollections, strongify, blink::Hea
|
| // Use the payload size as recorded by the heap to determine how many
|
| // elements to trace.
|
| size_t length = header->payloadSize() / sizeof(T);
|
| - if (WTF::IsPolymorphic<T>::value) {
|
| + if (std::is_polymorphic<T>::value) {
|
| for (size_t i = 0; i < length; ++i) {
|
| if (blink::vTableInitialized(&array[i]))
|
| blink::TraceIfEnabled<T, NeedsTracingTrait<Traits>::value>::trace(visitor, array[i]);
|
|
|