| Index: third_party/WebKit/Source/wtf/VectorTraits.h
|
| diff --git a/third_party/WebKit/Source/wtf/VectorTraits.h b/third_party/WebKit/Source/wtf/VectorTraits.h
|
| index 8d10684913d554b5176bb38a13848e746d0d81b1..04e0e68ee8abf9554357347cb094902d6cb3e1e3 100644
|
| --- a/third_party/WebKit/Source/wtf/VectorTraits.h
|
| +++ b/third_party/WebKit/Source/wtf/VectorTraits.h
|
| @@ -48,8 +48,8 @@ struct VectorTraitsBase {
|
| static const bool canFillWithMemset = IsTriviallyDefaultConstructible<T>::value && (sizeof(T) == sizeof(char));
|
| static const bool canCompareWithMemcmp = std::is_scalar<T>::value; // Types without padding.
|
| template <typename U = void>
|
| - struct NeedsTracingLazily {
|
| - static const bool value = NeedsTracing<T>::value;
|
| + struct IsTraceableInCollection {
|
| + static const bool value = IsTraceable<T>::value;
|
| };
|
| static const WeakHandlingFlag weakHandlingFlag = NoWeakHandlingInCollections; // We don't support weak handling in vectors.
|
| };
|
| @@ -99,8 +99,8 @@ struct VectorTraits<std::pair<First, Second>> {
|
| static const bool canCompareWithMemcmp = FirstTraits::canCompareWithMemcmp && SecondTraits::canCompareWithMemcmp;
|
| static const bool canClearUnusedSlotsWithMemset = FirstTraits::canClearUnusedSlotsWithMemset && SecondTraits::canClearUnusedSlotsWithMemset;
|
| template <typename U = void>
|
| - struct NeedsTracingLazily {
|
| - static const bool value = NeedsTracingTrait<FirstTraits>::value || NeedsTracingTrait<SecondTraits>::value;
|
| + struct IsTraceableInCollection {
|
| + static const bool value = IsTraceableInCollectionTrait<FirstTraits>::value || IsTraceableInCollectionTrait<SecondTraits>::value;
|
| };
|
| static const WeakHandlingFlag weakHandlingFlag = NoWeakHandlingInCollections; // We don't support weak handling in vectors.
|
| };
|
|
|