Index: third_party/WebKit/Source/core/css/CSSProperty.h |
diff --git a/third_party/WebKit/Source/core/css/CSSProperty.h b/third_party/WebKit/Source/core/css/CSSProperty.h |
index 6baf18638ff30f8e7bc98c53f854190689bfa04c..45e3694257742d25184c6b79d6f5ba21b8b22051 100644 |
--- a/third_party/WebKit/Source/core/css/CSSProperty.h |
+++ b/third_party/WebKit/Source/core/css/CSSProperty.h |
@@ -34,7 +34,7 @@ |
namespace blink { |
struct StylePropertyMetadata { |
- DISALLOW_ALLOCATION(); |
+ DISALLOW_NEW(); |
StylePropertyMetadata(CSSPropertyID propertyID, bool isSetFromShorthand, int indexInShorthandsVector, bool important, bool implicit, bool inherited) |
: m_propertyID(propertyID) |
, m_isSetFromShorthand(isSetFromShorthand) |
@@ -56,7 +56,7 @@ struct StylePropertyMetadata { |
}; |
class CSSProperty { |
- ALLOW_ONLY_INLINE_ALLOCATION(); |
+ DISALLOW_NEW_EXCEPT_PLACEMENT_NEW(); |
public: |
CSSProperty(CSSPropertyID propertyID, PassRefPtrWillBeRawPtr<CSSValue> value, bool important = false, bool isSetFromShorthand = false, int indexInShorthandsVector = 0, bool implicit = false) |
: m_metadata(propertyID, isSetFromShorthand, indexInShorthandsVector, important, implicit, CSSPropertyMetadata::isInheritedProperty(propertyID)) |