diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/platform/graphics/contiguous_container.h')
| -rw-r--r-- | chromium/third_party/blink/renderer/platform/graphics/contiguous_container.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/third_party/blink/renderer/platform/graphics/contiguous_container.h b/chromium/third_party/blink/renderer/platform/graphics/contiguous_container.h index d551da78b00..3430f74cb61 100644 --- a/chromium/third_party/blink/renderer/platform/graphics/contiguous_container.h +++ b/chromium/third_party/blink/renderer/platform/graphics/contiguous_container.h @@ -13,7 +13,6 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "third_party/blink/renderer/platform/platform_export.h" -#include "third_party/blink/renderer/platform/wtf/alignment.h" #include "third_party/blink/renderer/platform/wtf/allocator.h" #include "third_party/blink/renderer/platform/wtf/compiler.h" #include "third_party/blink/renderer/platform/wtf/type_traits.h" @@ -138,6 +137,8 @@ class ContiguousContainer : public ContiguousContainerBase { IteratorWrapper<Vector<void*>::const_reverse_iterator, const BaseElementType>; + using value_type = BaseElementType; + explicit ContiguousContainer(size_t max_object_size) : ContiguousContainerBase(Align(max_object_size)) {} @@ -199,7 +200,7 @@ class ContiguousContainer : public ContiguousContainerBase { DerivedElementType& AllocateAndConstruct(Args&&... args) { static_assert(WTF::IsSubclass<DerivedElementType, BaseElementType>::value, "Must use subclass of BaseElementType."); - static_assert(alignment % WTF_ALIGN_OF(DerivedElementType) == 0, + static_assert(alignment % alignof(DerivedElementType) == 0, "Derived type requires stronger alignment."); return *new (AlignedAllocate(sizeof(DerivedElementType))) DerivedElementType(std::forward<Args>(args)...); |