Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION

third_party/WebKit/Source/core/layout/MultiColumnFragmentainerGroup.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 MultiColumnFragmentainerGroup_h
 #define MultiColumnFragmentainerGroup_h
 
 #include "core/layout/LayoutMultiColumnFlowThread.h"
 #include "wtf/Allocator.h"
 
 namespace blink {
 
 // A group of columns, that are laid out in the inline progression direction, all with the same
 // column height.
 //
 // When a multicol container is inside another fragmentation context, and said multicol container
 // lives in multiple outer fragmentainers (pages / columns), we need to put these inner columns into
 // separate groups, with one group per outer fragmentainer. Such a group of columns is what
 // comprises a "row of column boxes" in spec lingo.
 //
 // Column balancing, when enabled, takes place within a column fragmentainer group.
 //
 // Each fragmentainer group may have its own actual column count (if there are unused columns
 // because of forced breaks, for example). If there are multiple fragmentainer groups, the actual
 // column count must not exceed the used column count (the one calculated based on column-count and
 // column-width from CSS), or they'd overflow the outer fragmentainer in the inline direction. If we
 // need more columns than what a group has room for, we'll create another group and put them there
 // (and make them appear in the next outer fragmentainer).
 class MultiColumnFragmentainerGroup {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     MultiColumnFragmentainerGroup(LayoutMultiColumnSet&);
 
     const LayoutMultiColumnSet& columnSet() const { return m_columnSet; }
 
     bool isFirstGroup() const;
     bool isLastGroup() const;
 
     // Position within the LayoutMultiColumnSet.
     LayoutUnit logicalTop() const { return m_logicalTop; }
@@ skipping 74 matching lines @@
 
     // The following variables are used when balancing the column set.
     LayoutUnit m_maxColumnHeight; // Maximum column height allowed.
     LayoutUnit m_minimumColumnHeight;
 };
 
 // List of all fragmentainer groups within a column set. There will always be at least one
 // group. Deleting the one group is not allowed (or possible). There will be more than one group if
 // the owning column set lives in multiple outer fragmentainers (e.g. multicol inside paged media).
 class CORE_EXPORT MultiColumnFragmentainerGroupList {
-    DISALLOW_ALLOCATION();
+    DISALLOW_NEW();
 public:
     MultiColumnFragmentainerGroupList(LayoutMultiColumnSet&);
     ~MultiColumnFragmentainerGroupList();
 
     // Add an additional fragmentainer group to the end of the list, and return it.
     MultiColumnFragmentainerGroup& addExtraGroup();
 
     // Remove all fragmentainer groups but the first one.
     void deleteExtraGroups();
 
@@ skipping 19 matching lines @@
 
 private:
     LayoutMultiColumnSet& m_columnSet;
 
     Vector<MultiColumnFragmentainerGroup, 1> m_groups;
 };
 
 } // namespace blink
 
 #endif // MultiColumnFragmentainerGroup_h