Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h |
diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h |
index df963367ba30e5319d592dd685108a230a2df91f..f61090f4c32613bfdc8f7f456ef4c972f8f8a64e 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h |
@@ -30,6 +30,8 @@ |
#include "core/layout/LayoutObject.h" |
#include "core/page/scrolling/StickyPositionScrollingConstraints.h" |
#include "platform/geometry/LayoutRect.h" |
+#include "wtf/PtrUtil.h" |
+#include <memory> |
namespace blink { |
@@ -370,15 +372,15 @@ private: |
LayoutBoxModelObjectRareData& ensureRareData() |
{ |
if (!m_rareData) |
- m_rareData = adoptPtr(new LayoutBoxModelObjectRareData()); |
+ m_rareData = wrapUnique(new LayoutBoxModelObjectRareData()); |
return *m_rareData.get(); |
} |
// The PaintLayer associated with this object. |
// |m_layer| can be nullptr depending on the return value of layerTypeRequired(). |
- OwnPtr<PaintLayer> m_layer; |
+ std::unique_ptr<PaintLayer> m_layer; |
- OwnPtr<LayoutBoxModelObjectRareData> m_rareData; |
+ std::unique_ptr<LayoutBoxModelObjectRareData> m_rareData; |
}; |
DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBoxModelObject, isBoxModelObject()); |