| Index: third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBlock.h b/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| index 59bcd535394114a15d7da63b617dec92f8d1433b..89e0b4a60e63d41ed3a702ae32b65072445100fe 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBlock.h
|
| @@ -26,7 +26,7 @@
|
| #include "core/CoreExport.h"
|
| #include "core/layout/LayoutBox.h"
|
| #include "wtf/ListHashSet.h"
|
| -#include "wtf/OwnPtr.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -35,7 +35,7 @@ class LineLayoutBox;
|
| class WordMeasurement;
|
|
|
| typedef WTF::ListHashSet<LayoutBox*, 16> TrackedLayoutBoxListHashSet;
|
| -typedef WTF::HashMap<const LayoutBlock*, OwnPtr<TrackedLayoutBoxListHashSet>> TrackedDescendantsMap;
|
| +typedef WTF::HashMap<const LayoutBlock*, std::unique_ptr<TrackedLayoutBoxListHashSet>> TrackedDescendantsMap;
|
| typedef WTF::HashMap<const LayoutBox*, LayoutBlock*> TrackedContainerMap;
|
| typedef Vector<WordMeasurement, 64> WordMeasurements;
|
|
|
|
|