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

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

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index 2dae9193d9c32f32b75eeb6aa231e20bf0b40965..0cda260965ad4a195be89ab2cd3e462c8d1cd65b 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -61,7 +61,6 @@
#include "platform/geometry/DoubleRect.h"
#include "platform/geometry/FloatQuad.h"
#include "platform/geometry/FloatRoundedRect.h"
-#include "wtf/PtrUtil.h"
#include <algorithm>
#include <math.h>
@@ -4200,7 +4199,7 @@ void LayoutBox::addLayoutOverflow(const LayoutRect& rect)
}
if (!m_overflow)
- m_overflow = wrapUnique(new BoxOverflowModel(clientBox, borderBoxRect()));
+ m_overflow = adoptPtr(new BoxOverflowModel(clientBox, borderBoxRect()));
m_overflow->addLayoutOverflow(overflowRect);
}
@@ -4215,7 +4214,7 @@ void LayoutBox::addSelfVisualOverflow(const LayoutRect& rect)
return;
if (!m_overflow)
- m_overflow = wrapUnique(new BoxOverflowModel(noOverflowRect(), borderBox));
+ m_overflow = adoptPtr(new BoxOverflowModel(noOverflowRect(), borderBox));
m_overflow->addSelfVisualOverflow(rect);
}
@@ -4233,7 +4232,7 @@ void LayoutBox::addContentsVisualOverflow(const LayoutRect& rect)
return;
if (!m_overflow)
- m_overflow = wrapUnique(new BoxOverflowModel(noOverflowRect(), borderBox));
+ m_overflow = adoptPtr(new BoxOverflowModel(noOverflowRect(), borderBox));
m_overflow->addContentsVisualOverflow(rect);
}
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutBox.h ('k') | third_party/WebKit/Source/core/layout/LayoutBoxModelObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698