| 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 8bbbad58dae4f6073db872b4be1c2f12f7eb70f1..1c425fb71134e3a6dd1f77d09df92feaad2a90e4 100644
|
| --- a/third_party/WebKit/Source/core/layout/FloatingObjects.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/FloatingObjects.cpp
|
| @@ -107,7 +107,7 @@ bool FloatingObject::shouldPaintForCompositedLayoutPart() {
|
| std::unique_ptr<FloatingObject> FloatingObject::create(
|
| LayoutBox* layoutObject) {
|
| std::unique_ptr<FloatingObject> newObj =
|
| - wrapUnique(new FloatingObject(layoutObject));
|
| + WTF::wrapUnique(new FloatingObject(layoutObject));
|
|
|
| // If a layer exists, the float will paint itself. Otherwise someone else
|
| // will.
|
| @@ -127,7 +127,7 @@ std::unique_ptr<FloatingObject> FloatingObject::copyToNewContainer(
|
| LayoutSize offset,
|
| bool shouldPaint,
|
| bool isDescendant) const {
|
| - return wrapUnique(new FloatingObject(
|
| + return WTF::wrapUnique(new FloatingObject(
|
| layoutObject(), getType(),
|
| LayoutRect(frameRect().location() - offset, frameRect().size()),
|
| shouldPaint, isDescendant, isLowestNonOverhangingFloatInChild()));
|
| @@ -135,8 +135,8 @@ std::unique_ptr<FloatingObject> FloatingObject::copyToNewContainer(
|
|
|
| std::unique_ptr<FloatingObject> FloatingObject::unsafeClone() const {
|
| std::unique_ptr<FloatingObject> cloneObject =
|
| - wrapUnique(new FloatingObject(layoutObject(), getType(), m_frameRect,
|
| - m_shouldPaint, m_isDescendant, false));
|
| + WTF::wrapUnique(new FloatingObject(layoutObject(), getType(), m_frameRect,
|
| + m_shouldPaint, m_isDescendant, false));
|
| cloneObject->m_isPlaced = m_isPlaced;
|
| return cloneObject;
|
| }
|
| @@ -553,7 +553,7 @@ FloatingObject* FloatingObjects::add(
|
| std::unique_ptr<FloatingObject> floatingObject) {
|
| FloatingObject* newObject = floatingObject.release();
|
| increaseObjectsCount(newObject->getType());
|
| - m_set.add(wrapUnique(newObject));
|
| + m_set.add(WTF::wrapUnique(newObject));
|
| if (newObject->isPlaced())
|
| addPlacedObject(*newObject);
|
| markLowestFloatLogicalBottomCacheAsDirty();
|
|
|