Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION

third_party/WebKit/Source/core/css/CSSFontFace.h

 /*
  * Copyright (C) 2007, 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 57 matching lines @@
 
     void addSource(PassOwnPtrWillBeRawPtr<CSSFontFaceSource>);
 
     void didBeginLoad();
     void fontLoaded(RemoteFontFaceSource*);
     void fontLoadWaitLimitExceeded(RemoteFontFaceSource*);
 
     PassRefPtr<SimpleFontData> getFontData(const FontDescription&);
 
     struct UnicodeRange {
-        ALLOW_ONLY_INLINE_ALLOCATION();
+        DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
         UnicodeRange(UChar32 from, UChar32 to)
             : m_from(from)
             , m_to(to)
         {
         }
 
         UChar32 from() const { return m_from; }
         UChar32 to() const { return m_to; }
         bool contains(UChar32 c) const { return m_from <= c && c <= m_to; }
         bool operator<(const UnicodeRange& other) const { return m_from < other.m_from; }
         bool operator<(UChar32 c) const { return m_to < c; }
         bool operator==(const FontDataRange& fontDataRange) const { return fontDataRange.from() == m_from && fontDataRange.to() == m_to; };
 
     private:
         UChar32 m_from;
         UChar32 m_to;
     };
 
     class CORE_EXPORT UnicodeRangeSet {
-        ALLOW_ONLY_INLINE_ALLOCATION();
+        DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
     public:
         explicit UnicodeRangeSet(const Vector<UnicodeRange>&);
         bool contains(UChar32) const;
         bool contains(const FontDataRange&) const;
         bool intersectsWith(const String&) const;
         bool isEntireRange() const { return m_ranges.isEmpty(); }
         size_t size() const { return m_ranges.size(); }
         const UnicodeRange& rangeAt(size_t i) const { return m_ranges[i]; }
     private:
         Vector<UnicodeRange> m_ranges; // If empty, represents the whole code space.
@@ skipping 14 matching lines @@
 
     UnicodeRangeSet m_ranges;
     RawPtrWillBeMember<CSSSegmentedFontFace> m_segmentedFontFace;
     WillBeHeapDeque<OwnPtrWillBeMember<CSSFontFaceSource>> m_sources;
     RawPtrWillBeMember<FontFace> m_fontFace;
 };
 
 }
 
 #endif