| Index: third_party/WebKit/Source/platform/fonts/shaping/ShapeResult.h
|
| diff --git a/third_party/WebKit/Source/platform/fonts/shaping/ShapeResult.h b/third_party/WebKit/Source/platform/fonts/shaping/ShapeResult.h
|
| index c83666d4d16876f1d1f49a4a105152089936bbcd..ba2f52d866c56c046adb7801d174451adbe42dc3 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/shaping/ShapeResult.h
|
| +++ b/third_party/WebKit/Source/platform/fonts/shaping/ShapeResult.h
|
| @@ -36,9 +36,9 @@
|
| #include "platform/text/TextDirection.h"
|
| #include "wtf/HashSet.h"
|
| #include "wtf/Noncopyable.h"
|
| -#include "wtf/OwnPtr.h"
|
| #include "wtf/RefCounted.h"
|
| #include "wtf/Vector.h"
|
| +#include <memory>
|
|
|
| struct hb_buffer_t;
|
|
|
| @@ -88,12 +88,12 @@ protected:
|
| }
|
|
|
| void applySpacing(ShapeResultSpacing&, const TextRun&);
|
| - void insertRun(PassOwnPtr<ShapeResult::RunInfo>, unsigned startGlyph,
|
| + void insertRun(std::unique_ptr<ShapeResult::RunInfo>, unsigned startGlyph,
|
| unsigned numGlyphs, hb_buffer_t*);
|
|
|
| float m_width;
|
| FloatRect m_glyphBoundingBox;
|
| - Vector<OwnPtr<RunInfo>> m_runs;
|
| + Vector<std::unique_ptr<RunInfo>> m_runs;
|
| RefPtr<SimpleFontData> m_primaryFont;
|
|
|
| unsigned m_numCharacters;
|
|
|