Use C++11 alignment primitives

cc/paint/paint_op_buffer.h

 // Copyright 2017 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 CC_PAINT_PAINT_OP_BUFFER_H_
 #define CC_PAINT_PAINT_OP_BUFFER_H_
 
 #include <stdint.h>
 
 #include "base/logging.h"
@@ skipping 191 matching lines @@
 
   template <typename T>
   const M* GetArrayForThis(const T* op) const {
     static_assert(std::is_convertible<T, PaintOpWithArrayBase>::value,
                   "T is not a PaintOpWithData");
     // As an optimization to not have to store an additional offset,
     // assert that T has the same or more alignment requirements than M.  Thus,
     // if T is aligned, and M's alignment needs are a multiple of T's size, then
     // M will also be aligned when placed immediately after T.
     static_assert(
-        sizeof(T) % ALIGNOF(M) == 0,
+        sizeof(T) % alignof(M) == 0,
         "T must be padded such that an array of M is aligned after it");
     static_assert(
-        ALIGNOF(T) >= ALIGNOF(M),
+        alignof(T) >= alignof(M),
         "T must have not have less alignment requirements than the array data");
     return reinterpret_cast<const M*>(op + 1);
   }
 
   template <typename T>
   M* GetArrayForThis(T* op) {
     return const_cast<M*>(
         const_cast<const PaintOpWithArray*>(this)->GetArrayForThis(
             const_cast<T*>(op)));
   }
@@ skipping 538 matching lines @@
   SkScalar dy;
 };
 
 using LargestPaintOp = DrawDRRectOp;
 
 class CC_PAINT_EXPORT PaintOpBuffer : public SkRefCnt {
  public:
   enum { kInitialBufferSize = 4096 };
   // It's not necessarily the case that the op with the maximum alignment
   // requirements is also the biggest op, but for now that's true.
-  static constexpr size_t PaintOpAlign = ALIGNOF(DrawDRRectOp);
+  static constexpr size_t PaintOpAlign = alignof(DrawDRRectOp);
 
   PaintOpBuffer();
   ~PaintOpBuffer() override;
 
   void Reset();
 
   void playback(SkCanvas* canvas,
                 SkPicture::AbortCallback* callback = nullptr) const;
   // This can be used to play back a subset of the PaintOpBuffer.
   // The |range_starts| array is an increasing set of positions in the
@@ skipping 27 matching lines @@
   size_t bytes_used() const {
     return sizeof(*this) + reserved_ + subrecord_bytes_used_;
   }
   int numSlowPaths() const { return num_slow_paths_; }
   bool HasDiscardableImages() const { return has_discardable_images_; }
 
   // Resize the PaintOpBuffer to exactly fit the current amount of used space.
   void ShrinkToFit();
 
   PaintOp* GetFirstOp() const {
-    return const_cast<PaintOp*>(first_op_.data_as<PaintOp>());
+    return const_cast<PaintOp*>(reinterpret_cast<const PaintOp*>(&first_op_));
   }
 
   template <typename T, typename... Args>
   void push(Args&&... args) {
     static_assert(std::is_convertible<T, PaintOp>::value, "T not a PaintOp.");
     static_assert(!std::is_convertible<T, PaintOpWithData>::value,
                   "Type needs to use push_with_data");
     push_internal<T>(0, std::forward<Args>(args)...);
   }
 
@@ skipping 91 matching lines @@
   };
 
  private:
   void ReallocBuffer(size_t new_size);
   // Returns the allocated op and the number of bytes to skip in |data_| to get
   // to the next op.
   std::pair<void*, size_t> AllocatePaintOp(size_t sizeof_op, size_t bytes);
 
   template <typename T, typename... Args>
   T* push_internal(size_t bytes, Args&&... args) {
-    static_assert(ALIGNOF(T) <= PaintOpAlign, "");
+    static_assert(alignof(T) <= PaintOpAlign, "");
 
     auto pair = AllocatePaintOp(sizeof(T), bytes);
     T* op = reinterpret_cast<T*>(pair.first);
     size_t skip = pair.second;
 
     new (op) T{std::forward<Args>(args)...};
     op->type = static_cast<uint32_t>(T::kType);
     op->skip = skip;
     AnalyzeAddedOp(op);
     return op;
   }
 
   template <typename T>
   void AnalyzeAddedOp(const T* op) {
     num_slow_paths_ += op->CountSlowPathsFromFlags();
     num_slow_paths_ += op->CountSlowPaths();
 
     has_discardable_images_ |= op->HasDiscardableImages();
     has_discardable_images_ |= op->HasDiscardableImagesFromFlags();
 
     subrecord_bytes_used_ += op->AdditionalBytesUsed();
   }
 
   // As a performance optimization because n=1 is an extremely common case just
   // store the first op in the PaintOpBuffer itself to avoid an extra alloc.
-  base::AlignedMemory<sizeof(LargestPaintOp), PaintOpAlign> first_op_;
+  std::aligned_storage<sizeof(LargestPaintOp), PaintOpAlign>::type first_op_;
   std::unique_ptr<char, base::AlignedFreeDeleter> data_;
   size_t used_ = 0;
   size_t reserved_ = 0;
   size_t op_count_ = 0;
 
   // Record paths for veto-to-msaa for gpu raster.
   int num_slow_paths_ = 0;
   // Record additional bytes used by referenced sub-records and display lists.
   size_t subrecord_bytes_used_ = 0;
   bool has_discardable_images_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(PaintOpBuffer);
 };
 
 }  // namespace cc
 
 #endif  // CC_PAINT_PAINT_OP_BUFFER_H_