Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(615)

Unified Diff: third_party/WebKit/Source/core/layout/LayoutBox.h

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: First attempt to land. Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/layout/LayoutBox.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.h b/third_party/WebKit/Source/core/layout/LayoutBox.h
index 0f80c7e9498b1e19096a1d7080dddfc6ee8cda7d..5b41c52907d099a0c194531c74f5ba6b6efc872b 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.h
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.h
@@ -28,6 +28,8 @@
#include "core/layout/OverflowModel.h"
#include "core/layout/ScrollEnums.h"
#include "platform/scroll/ScrollTypes.h"
+#include "wtf/PtrUtil.h"
+#include <memory>
namespace blink {
@@ -87,12 +89,12 @@ public:
LayoutBox* m_snapContainer;
// For snap container, the descendant snap areas that contribute snap
// points.
- OwnPtr<SnapAreaSet> m_snapAreas;
+ std::unique_ptr<SnapAreaSet> m_snapAreas;
SnapAreaSet& ensureSnapAreas()
{
if (!m_snapAreas)
- m_snapAreas = adoptPtr(new SnapAreaSet);
+ m_snapAreas = wrapUnique(new SnapAreaSet);
return *m_snapAreas;
}
@@ -1059,7 +1061,7 @@ private:
LayoutBoxRareData& ensureRareData()
{
if (!m_rareData)
- m_rareData = adoptPtr(new LayoutBoxRareData());
+ m_rareData = wrapUnique(new LayoutBoxRareData());
return *m_rareData.get();
}
@@ -1122,13 +1124,13 @@ protected:
LayoutUnit m_maxPreferredLogicalWidth;
// Our overflow information.
- OwnPtr<BoxOverflowModel> m_overflow;
+ std::unique_ptr<BoxOverflowModel> m_overflow;
private:
// The inline box containing this LayoutBox, for atomic inline elements.
InlineBox* m_inlineBoxWrapper;
- OwnPtr<LayoutBoxRareData> m_rareData;
+ std::unique_ptr<LayoutBoxRareData> m_rareData;
};
DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutBox, isBox());
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBlockFlow.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698