Fix alignment issue of ContiguousContainer

third_party/WebKit/Source/platform/graphics/ContiguousContainer.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ContiguousContainer_h
 #define ContiguousContainer_h
 
 #include "platform/PlatformExport.h"
 #include "wtf/Alignment.h"
 #include "wtf/Allocator.h"
@@ skipping 37 matching lines @@
     ContiguousContainerBase& operator=(ContiguousContainerBase&&);
 
     size_t size() const { return m_elements.size(); }
     bool isEmpty() const { return !size(); }
     size_t capacityInBytes() const;
     size_t usedCapacityInBytes() const;
     size_t memoryUsageInBytes() const;
 
     // These do not invoke constructors or destructors.
     void reserveInitialCapacity(size_t, const char* typeName);
-    void* allocate(size_t objectSize, const char* typeName);
+    void* allocate(size_t objectSize, size_t alignment, const char* typeName);
     void removeLast();
     void clear();
     void swap(ContiguousContainerBase&);
 
     Vector<void*> m_elements;
 
 private:
     class Buffer;
 
     Buffer* allocateNewBufferForNextAllocation(size_t, const char* typeName);
 
     Vector<std::unique_ptr<Buffer>> m_buffers;
     unsigned m_endIndex;
     size_t m_maxObjectSize;
 };
 
-// For most cases, no alignment stricter than pointer alignment is required. If
-// one of the derived classes has stronger alignment requirements (and the
-// static_assert fires), set alignment to the LCM of the derived class
-// alignments. For small structs without pointers, it may be possible to reduce
-// alignment for tighter packing.
-
-template <class BaseElementType, unsigned alignment = sizeof(void*)>
+template <class BaseElementType>
 class ContiguousContainer : public ContiguousContainerBase {
 private:
     // Declares itself as a forward iterator, but also supports a few more
     // things. The whole random access iterator interface is a bit much.
     template <typename BaseIterator, typename ValueType>
     class IteratorWrapper : public std::iterator<std::forward_iterator_tag, ValueType> {
         DISALLOW_NEW();
     public:
         IteratorWrapper() {}
         bool operator==(const IteratorWrapper& other) const { return m_it == other.m_it; }
         bool operator!=(const IteratorWrapper& other) const { return m_it != other.m_it; }
         ValueType& operator*() const { return *static_cast<ValueType*>(*m_it); }
         ValueType* operator->() const { return &operator*(); }
         IteratorWrapper operator+(std::ptrdiff_t n) const { return IteratorWrapper(m_it + n); }
         IteratorWrapper operator++(int) { IteratorWrapper tmp = *this; ++m_it; return tmp; }
         std::ptrdiff_t operator-(const IteratorWrapper& other) const { return m_it - other.m_it; }
         IteratorWrapper& operator++() { ++m_it; return *this; }
     private:
         explicit IteratorWrapper(const BaseIterator& it) : m_it(it) {}
         BaseIterator m_it;
         friend class ContiguousContainer;
     };
 
 public:
     using iterator = IteratorWrapper<Vector<void*>::iterator, BaseElementType>;
     using const_iterator = IteratorWrapper<Vector<void*>::const_iterator, const BaseElementType>;
     using reverse_iterator = IteratorWrapper<Vector<void*>::reverse_iterator, BaseElementType>;
     using const_reverse_iterator = IteratorWrapper<Vector<void*>::const_reverse_iterator, const BaseElementType>;
 
-    explicit ContiguousContainer(size_t maxObjectSize) : ContiguousContainerBase(align(maxObjectSize)) {}
+    explicit ContiguousContainer(size_t maxObjectSize) : ContiguousContainerBase(maxObjectSize) {}
 
     ContiguousContainer(size_t maxObjectSize, size_t initialSizeBytes)
         : ContiguousContainer(maxObjectSize)
     {
         reserveInitialCapacity(std::max(maxObjectSize, initialSizeBytes), WTF_HEAP_PROFILER_TYPE_NAME(BaseElementType));
     }
 
     ContiguousContainer(ContiguousContainer&& source)
         : ContiguousContainerBase(std::move(source)) {}
 
@@ skipping 35 matching lines @@
     BaseElementType& last() { return *rbegin(); }
     const BaseElementType& last() const { return *rbegin(); }
     BaseElementType& operator[](size_t index) { return *(begin() + index); }
     const BaseElementType& operator[](size_t index) const { return *(begin() + index); }
 
     template <class DerivedElementType, typename... Args>
     DerivedElementType& allocateAndConstruct(Args&&... args)
     {
         static_assert(WTF::IsSubclass<DerivedElementType, BaseElementType>::value,
             "Must use subclass of BaseElementType.");
-        static_assert(alignment % WTF_ALIGN_OF(DerivedElementType) == 0,
-            "Derived type requires stronger alignment.");
-        size_t allocSize = align(sizeof(DerivedElementType));
-        return *new (allocate(allocSize)) DerivedElementType(std::forward<Args>(args)...);
+        return *new (allocate(sizeof(DerivedElementType), WTF_ALIGN_OF(DerivedElementType)))
+            DerivedElementType(std::forward<Args>(args)...);
     }
 
     void removeLast()
     {
         ASSERT(!isEmpty());
         last().~BaseElementType();
         ContiguousContainerBase::removeLast();
     }
 
     void clear()
     {
         for (auto& element : *this) {
             (void)element; // MSVC incorrectly reports this variable as unused.
             element.~BaseElementType();
         }
         ContiguousContainerBase::clear();
     }
 
     void swap(ContiguousContainer& other) { ContiguousContainerBase::swap(other); }
 
     // Appends a new element using memcpy, then default-constructs a base
     // element in its place. Use with care.
-    BaseElementType& appendByMoving(BaseElementType& item, size_t size)
+    BaseElementType& appendByMoving(BaseElementType& item, size_t size, size_t alignment)
     {
         ASSERT(size >= sizeof(BaseElementType));
-        void* newItem = allocate(size);
+        void* newItem = allocate(size, alignment);
         memcpy(newItem, static_cast<void*>(&item), size);
         new (&item) BaseElementType;
         return *static_cast<BaseElementType*>(newItem);
     }
 
 private:
-    void* allocate(size_t objectSize)
+    FRIEND_TEST_ALL_PREFIXES(ContiguousContainerTest, Alignment);
+
+    void* allocate(size_t objectSize, size_t alignment)
     {
-        return ContiguousContainerBase::allocate(objectSize, WTF_HEAP_PROFILER_TYPE_NAME(BaseElementType));
-    }
-
-    static size_t align(size_t size)
-    {
-        size_t alignedSize = alignment * ((size + alignment - 1) / alignment);
-        ASSERT(alignedSize % alignment == 0);
-        ASSERT(alignedSize >= size);
-        ASSERT(alignedSize < size + alignment);
-        return alignedSize;
+        return ContiguousContainerBase::allocate(objectSize, alignment, WTF_HEAP_PROFILER_TYPE_NAME(BaseElementType));
     }
 };
 
 } // namespace blink
 
 #endif // ContiguousContainer_h