| Index: third_party/WebKit/Source/core/layout/LayoutBlockFlow.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h
|
| index e4cb2a07c34714ea2ab2c92684b99dc64c45badc..d995052037b8d3f2cda3fdcbe0fdef25d19328fc 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlockFlow.h
|
| @@ -392,7 +392,7 @@ private:
|
|
|
| public:
|
| struct FloatWithRect {
|
| - ALLOW_ONLY_INLINE_ALLOCATION();
|
| + DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
|
| FloatWithRect(LayoutBox* f)
|
| : object(f)
|
| , rect(f->frameRect())
|
| @@ -407,7 +407,7 @@ public:
|
| };
|
|
|
| class MarginValues {
|
| - DISALLOW_ALLOCATION();
|
| + DISALLOW_NEW();
|
| public:
|
| MarginValues(LayoutUnit beforePos, LayoutUnit beforeNeg, LayoutUnit afterPos, LayoutUnit afterNeg)
|
| : m_positiveMarginBefore(beforePos)
|
|
|