Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(680)

Unified Diff: third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 3954e366d20f5971c2025d916e349e4fd38bf2b3..5926e2b4eeadd02b83abd5c2e9e5059aa8115852 100644
--- a/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.h
+++ b/third_party/WebKit/Source/platform/fonts/GlyphPageTreeNode.h
@@ -32,10 +32,11 @@
#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 {
@@ -133,9 +134,9 @@ private:
static GlyphPageTreeNode* pageZeroRoot;
RefPtr<GlyphPage> m_page;
- typedef HashMap<const FontData*, std::unique_ptr<GlyphPageTreeNode>> GlyphPageTreeNodeMap;
+ typedef HashMap<const FontData*, OwnPtr<GlyphPageTreeNode>> GlyphPageTreeNodeMap;
GlyphPageTreeNodeMap m_children;
- std::unique_ptr<SystemFallbackGlyphPageTreeNode> m_systemFallbackChild;
+ OwnPtr<SystemFallbackGlyphPageTreeNode> m_systemFallbackChild;
};
class PLATFORM_EXPORT SystemFallbackGlyphPageTreeNode : public GlyphPageTreeNodeBase {

Powered by Google App Engine
This is Rietveld 408576698