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

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

Issue 1979183002: Remove OwnPtr::release() calls in core/ (part 3). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge with trunk. Created 4 years, 7 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/FloatingObjects.cpp
diff --git a/third_party/WebKit/Source/core/layout/FloatingObjects.cpp b/third_party/WebKit/Source/core/layout/FloatingObjects.cpp
index 85a93e7520b7c9bf1f0d58e7cb8944ba7aff8ec5..fe47a39ebf3370113da807baf3b59eb5c40cff3e 100644
--- a/third_party/WebKit/Source/core/layout/FloatingObjects.cpp
+++ b/third_party/WebKit/Source/core/layout/FloatingObjects.cpp
@@ -82,7 +82,7 @@ PassOwnPtr<FloatingObject> FloatingObject::create(LayoutBox* layoutObject)
newObj->setShouldPaint(!layoutObject->hasSelfPaintingLayer()); // If a layer exists, the float will paint itself. Otherwise someone else will.
newObj->setIsDescendant(true);
- return newObj.release();
+ return newObj;
}
PassOwnPtr<FloatingObject> FloatingObject::copyToNewContainer(LayoutSize offset, bool shouldPaint, bool isDescendant) const
@@ -94,7 +94,7 @@ PassOwnPtr<FloatingObject> FloatingObject::unsafeClone() const
{
OwnPtr<FloatingObject> cloneObject = adoptPtr(new FloatingObject(layoutObject(), getType(), m_frameRect, m_shouldPaint, m_isDescendant, false));
cloneObject->m_isPlaced = m_isPlaced;
- return cloneObject.release();
+ return cloneObject;
}
template <FloatingObject::Type FloatTypeValue>
@@ -388,7 +388,7 @@ void FloatingObjects::moveAllToFloatInfoMap(LayoutBoxToFloatInfoMap& map)
while (!m_set.isEmpty()) {
OwnPtr<FloatingObject> floatingObject = m_set.takeFirst();
LayoutBox* layoutObject = floatingObject->layoutObject();
- map.add(layoutObject, floatingObject.release());
+ map.add(layoutObject, std::move(floatingObject));
}
clear();
}
« no previous file with comments | « third_party/WebKit/Source/core/inspector/ThreadDebugger.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutAnalyzer.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698