| Index: third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.h
|
| diff --git a/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.h b/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.h
|
| index 5926e2b4eeadd02b83abd5c2e9e5059aa8115852..3954e366d20f5971c2025d916e349e4fd38bf2b3 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.h
|
| +++ b/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.h
|
| @@ -32,11 +32,10 @@
|
| #include "platform/fonts/GlyphPage.h"
|
| #include "wtf/Allocator.h"
|
| #include "wtf/HashMap.h"
|
| -#include "wtf/OwnPtr.h"
|
| #include "wtf/PassRefPtr.h"
|
| #include "wtf/text/Unicode.h"
|
| +#include <memory>
|
| #include <string.h>
|
| -
|
| #include <unicode/uscript.h>
|
|
|
| namespace blink {
|
| @@ -134,9 +133,9 @@ private:
|
| static GlyphPageTreeNode* pageZeroRoot;
|
|
|
| RefPtr<GlyphPage> m_page;
|
| - typedef HashMap<const FontData*, OwnPtr<GlyphPageTreeNode>> GlyphPageTreeNodeMap;
|
| + typedef HashMap<const FontData*, std::unique_ptr<GlyphPageTreeNode>> GlyphPageTreeNodeMap;
|
| GlyphPageTreeNodeMap m_children;
|
| - OwnPtr<SystemFallbackGlyphPageTreeNode> m_systemFallbackChild;
|
| + std::unique_ptr<SystemFallbackGlyphPageTreeNode> m_systemFallbackChild;
|
| };
|
|
|
| class PLATFORM_EXPORT SystemFallbackGlyphPageTreeNode : public GlyphPageTreeNodeBase {
|
|
|