Use C++11 alignment primitives

cc/paint/paint_op_buffer.cc

 // 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.
 
 #include "cc/paint/paint_op_buffer.h"
 
 #include "base/containers/stack_container.h"
 #include "cc/paint/display_item_list.h"
 #include "cc/paint/paint_record.h"
 #include "third_party/skia/include/core/SkAnnotation.h"
@@ skipping 176 matching lines @@
 static bool g_is_draw_op[kNumOpTypes] = {TYPES(M)};
 #undef M
 
 #define M(T)                                         \
   static_assert(sizeof(T) <= sizeof(LargestPaintOp), \
                 #T " must be no bigger than LargestPaintOp");
 TYPES(M);
 #undef M
 
 #define M(T)                                               \
-  static_assert(ALIGNOF(T) <= PaintOpBuffer::PaintOpAlign, \
+  static_assert(alignof(T) <= PaintOpBuffer::PaintOpAlign, \
                 #T " must have alignment no bigger than PaintOpAlign");
 TYPES(M);
 #undef M
 
 #undef TYPES
 
 SkRect PaintOp::kUnsetRect = {SK_ScalarInfinity, 0, 0, 0};
 
 void AnnotateOp::Raster(const PaintOp* base_op,
                         SkCanvas* canvas,
@@ skipping 565 matching lines @@
                                                         size_t bytes) {
   if (!op_count_) {
     if (bytes) {
       // Internal first_op buffer doesn't have room for extra data.
       // If the op wants extra bytes, then we'll just store a Noop
       // in the first_op and proceed from there.  This seems unlikely
       // to be a common case.
       push<NoopOp>();
     } else {
       op_count_++;
-      return std::make_pair(first_op_.void_data(), 0);
+      return std::pair<void*, size_t>(&first_op_, 0);
     }
   }
 
   // We've filled |first_op_| by now so we need to allocate space in |data_|.
   DCHECK(op_count_);
 
   // Compute a skip such that all ops in the buffer are aligned to the
   // maximum required alignment of all ops.
   size_t skip = MathUtil::UncheckedRoundUp(sizeof_op + bytes, PaintOpAlign);
   DCHECK_LT(skip, static_cast<size_t>(1) << 24);
@@ skipping 13 matching lines @@
   return std::make_pair(op, skip);
 }
 
 void PaintOpBuffer::ShrinkToFit() {
   if (!used_ || used_ == reserved_)
     return;
   ReallocBuffer(used_);
 }
 
 }  // namespace cc