| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef Optional_h | 5 #ifndef Optional_h |
| 6 #define Optional_h | 6 #define Optional_h |
| 7 | 7 |
| 8 #include "base/optional.h" | 8 #include "base/optional.h" |
| 9 #include "platform/wtf/TypeTraits.h" | 9 #include "platform/wtf/TypeTraits.h" |
| 10 | 10 |
| 11 namespace WTF { | 11 namespace WTF { |
| 12 | 12 |
| 13 // WTF::Optional is base::Optional. See base/optional.h for documentation. | 13 // WTF::Optional is base::Optional. See base/optional.h for documentation. |
| 14 // | 14 // |
| 15 // A clang plugin enforces that garbage collected types are not allocated | 15 // A clang plugin enforces that garbage collected types are not allocated |
| 16 // outside of the heap, similarly we enforce that one doesn't create garbage | 16 // outside of the heap, similarly we enforce that one doesn't create garbage |
| 17 // collected types nested inside an Optional. | 17 // collected types nested inside an Optional. |
| 18 template <typename T> | 18 template <typename T> |
| 19 using Optional = typename std::enable_if<!IsGarbageCollectedType<T>::value, | 19 using Optional = |
| 20 base::Optional<T>>::type; | 20 typename std::enable_if<!IsGarbageCollectedType<T>::value || |
| 21 IsPersistentReferenceType<T>::value, |
| 22 base::Optional<T>>::type; |
| 21 | 23 |
| 22 constexpr base::nullopt_t kNullopt = base::nullopt; | 24 constexpr base::nullopt_t kNullopt = base::nullopt; |
| 23 constexpr base::in_place_t in_place = base::in_place; | 25 constexpr base::in_place_t in_place = base::in_place; |
| 24 | 26 |
| 25 } // namespace WTF | 27 } // namespace WTF |
| 26 | 28 |
| 27 using WTF::Optional; | 29 using WTF::Optional; |
| 28 | 30 |
| 29 #endif // Optional_h | 31 #endif // Optional_h |
| OLD | NEW |