Index: third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp |
diff --git a/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp b/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp |
index efed5b9083f72d60fc2b920d60074b69e495437f..e18b729add468319d025eaaa67c834edfeb2e720 100644 |
--- a/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp |
+++ b/third_party/WebKit/Source/platform/fonts/SimpleFontData.cpp |
@@ -38,11 +38,9 @@ |
#include "platform/fonts/VDMXParser.h" |
#include "platform/geometry/FloatRect.h" |
#include "wtf/MathExtras.h" |
-#include "wtf/PtrUtil.h" |
#include "wtf/allocator/Partitions.h" |
#include "wtf/text/CharacterNames.h" |
#include "wtf/text/Unicode.h" |
-#include <memory> |
#include <unicode/unorm.h> |
#include <unicode/utf16.h> |
@@ -345,9 +343,9 @@ bool SimpleFontData::isTextOrientationFallbackOf(const SimpleFontData* fontData) |
|| fontData->m_derivedFontData->verticalRightOrientation == this; |
} |
-std::unique_ptr<SimpleFontData::DerivedFontData> SimpleFontData::DerivedFontData::create(bool forCustomFont) |
+PassOwnPtr<SimpleFontData::DerivedFontData> SimpleFontData::DerivedFontData::create(bool forCustomFont) |
{ |
- return wrapUnique(new DerivedFontData(forCustomFont)); |
+ return adoptPtr(new DerivedFontData(forCustomFont)); |
} |
SimpleFontData::DerivedFontData::~DerivedFontData() |