Rename DISALLOW_ALLOCATION and ALLOW_ONLY_INLINE_ALLOCATION

third_party/WebKit/Source/core/svg/animation/SMILTime.h

 /*
  * Copyright (C) 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 16 matching lines @@
 #define SMILTime_h
 
 #include "wtf/Allocator.h"
 #include "wtf/Assertions.h"
 #include "wtf/HashTraits.h"
 #include "wtf/MathExtras.h"
 
 namespace blink {
 
 class SMILTime {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     SMILTime() : m_time(0) { }
     SMILTime(double time) : m_time(time) { }
 
     static SMILTime unresolved() { return std::numeric_limits<double>::quiet_NaN(); }
     static SMILTime indefinite() { return std::numeric_limits<double>::infinity(); }
 
     double value() const { return m_time; }
 
     bool isFinite() const { return std::isfinite(m_time); }
     bool isIndefinite() const { return std::isinf(m_time); }
     bool isUnresolved() const { return std::isnan(m_time); }
 
 private:
     double m_time;
 };
 
 class SMILTimeWithOrigin {
-    ALLOW_ONLY_INLINE_ALLOCATION();
+    DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     enum Origin {
         ParserOrigin,
         ScriptOrigin
     };
 
     SMILTimeWithOrigin()
         : m_origin(ParserOrigin)
     {
     }
 
     SMILTimeWithOrigin(const SMILTime& time, Origin origin)
         : m_time(time)
         , m_origin(origin)
     {
     }
 
     const SMILTime& time() const { return m_time; }
     bool originIsScript() const { return m_origin == ScriptOrigin; }
 
 private:
     SMILTime m_time;
     Origin m_origin;
 };
 
 struct SMILInterval {
-    DISALLOW_ALLOCATION();
+    DISALLOW_NEW();
     SMILInterval() { }
     SMILInterval(const SMILTime& begin, const SMILTime& end) : begin(begin), end(end) { }
 
     SMILTime begin;
     SMILTime end;
 };
 
 inline bool operator==(const SMILTime& a, const SMILTime& b) { return (a.isUnresolved() && b.isUnresolved()) || a.value() == b.value(); }
 inline bool operator!(const SMILTime& a) { return !a.isFinite() || !a.value(); }
 inline bool operator!=(const SMILTime& a, const SMILTime& b) { return !operator==(a, b); }
@@ skipping 35 matching lines @@
 
 template<> struct HashTraits<blink::SMILTime> : GenericHashTraits<blink::SMILTime> {
     static blink::SMILTime emptyValue() { return blink::SMILTime::unresolved(); }
     static void constructDeletedValue(blink::SMILTime& slot, bool) { slot = -std::numeric_limits<double>::infinity(); }
     static bool isDeletedValue(blink::SMILTime value) { return value == -std::numeric_limits<double>::infinity(); }
 };
 
 } // namespace WTF
 
 #endif // SMILTime_h