| Index: third_party/WebKit/Source/platform/wtf/Optional.h
|
| diff --git a/third_party/WebKit/Source/platform/wtf/Optional.h b/third_party/WebKit/Source/platform/wtf/Optional.h
|
| index d1a12583aaad42ff088d549bd6b5ebac292ead59..9c869257851a33d5f4c4c993f2d943f226b2db39 100644
|
| --- a/third_party/WebKit/Source/platform/wtf/Optional.h
|
| +++ b/third_party/WebKit/Source/platform/wtf/Optional.h
|
| @@ -16,8 +16,10 @@ namespace WTF {
|
| // outside of the heap, similarly we enforce that one doesn't create garbage
|
| // collected types nested inside an Optional.
|
| template <typename T>
|
| -using Optional = typename std::enable_if<!IsGarbageCollectedType<T>::value,
|
| - base::Optional<T>>::type;
|
| +using Optional =
|
| + typename std::enable_if<!IsGarbageCollectedType<T>::value ||
|
| + IsPersistentReferenceType<T>::value,
|
| + base::Optional<T>>::type;
|
|
|
| constexpr base::nullopt_t kNullopt = base::nullopt;
|
| constexpr base::in_place_t in_place = base::in_place;
|
|
|