| Index: third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
|
| diff --git a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
|
| index 9cd14249aeded8b95df5c3257acb794f750b749f..0a602621bd74684f68d144eda69192449ebdc38b 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
|
| +++ b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp
|
| @@ -42,8 +42,10 @@
|
| #include "public/platform/Platform.h"
|
| #include "public/platform/linux/WebSandboxSupport.h"
|
| #include "wtf/Assertions.h"
|
| +#include "wtf/PtrUtil.h"
|
| #include "wtf/text/AtomicString.h"
|
| #include "wtf/text/CString.h"
|
| +#include <memory>
|
| #include <unicode/locid.h>
|
|
|
| #if !OS(WIN) && !OS(ANDROID)
|
| @@ -201,7 +203,7 @@ PassRefPtr<SkTypeface> FontCache::createTypeface(const FontDescription& fontDesc
|
| }
|
|
|
| #if !OS(WIN)
|
| -PassOwnPtr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription,
|
| +std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription,
|
| const FontFaceCreationParams& creationParams, float fontSize)
|
| {
|
| CString name;
|
| @@ -209,7 +211,7 @@ PassOwnPtr<FontPlatformData> FontCache::createFontPlatformData(const FontDescrip
|
| if (!tf)
|
| return nullptr;
|
|
|
| - return adoptPtr(new FontPlatformData(tf,
|
| + return wrapUnique(new FontPlatformData(tf,
|
| name.data(),
|
| fontSize,
|
| (fontDescription.weight() > 200 + tf->fontStyle().weight()) || fontDescription.isSyntheticBold(),
|
|
|