| Index: third_party/WebKit/Source/core/layout/line/RootInlineBox.h
|
| diff --git a/third_party/WebKit/Source/core/layout/line/RootInlineBox.h b/third_party/WebKit/Source/core/layout/line/RootInlineBox.h
|
| index 538b0def387de3d18e601e6905902db295a13714..09df02ade5aab5e418b0955e67972c86df89dddf 100644
|
| --- a/third_party/WebKit/Source/core/layout/line/RootInlineBox.h
|
| +++ b/third_party/WebKit/Source/core/layout/line/RootInlineBox.h
|
| @@ -25,8 +25,6 @@
|
| #include "core/layout/api/SelectionState.h"
|
| #include "core/layout/line/InlineFlowBox.h"
|
| #include "platform/text/BidiContext.h"
|
| -#include "wtf/PtrUtil.h"
|
| -#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -126,7 +124,7 @@ public:
|
| if (m_floats)
|
| m_floats->append(floatingBox);
|
| else
|
| - m_floats= wrapUnique(new Vector<LayoutBox*>(1, floatingBox));
|
| + m_floats= adoptPtr(new Vector<LayoutBox*>(1, floatingBox));
|
| }
|
|
|
| Vector<LayoutBox*>* floatsPtr() { ASSERT(!isDirty()); return m_floats.get(); }
|
| @@ -184,7 +182,7 @@ private:
|
|
|
| // Floats hanging off the line are pushed into this vector during layout. It is only
|
| // good for as long as the line has not been marked dirty.
|
| - std::unique_ptr<Vector<LayoutBox*>> m_floats;
|
| + OwnPtr<Vector<LayoutBox*>> m_floats;
|
|
|
| LayoutUnit m_lineTop;
|
| LayoutUnit m_lineBottom;
|
|
|