| Index: third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
|
| diff --git a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
|
| index d8a150d59e30d9a7d763a4c2bf5c90334d32fbc5..5d6a886dedbbec51938aa31f58b96e84c61691d7 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
|
| +++ b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
|
| @@ -40,6 +40,8 @@
|
| #include "platform/fonts/FontPlatformData.h"
|
| #include "platform/fonts/SimpleFontData.h"
|
| #include "platform/fonts/win/FontFallbackWin.h"
|
| +#include "wtf/PtrUtil.h"
|
| +#include <memory>
|
|
|
| namespace blink {
|
|
|
| @@ -355,7 +357,7 @@ static bool typefacesHasStretchSuffix(const AtomicString& family,
|
| return false;
|
| }
|
|
|
| -PassOwnPtr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription,
|
| +std::unique_ptr<FontPlatformData> FontCache::createFontPlatformData(const FontDescription& fontDescription,
|
| const FontFaceCreationParams& creationParams, float fontSize)
|
| {
|
| ASSERT(creationParams.creationType() == CreateFontByFamily);
|
| @@ -393,7 +395,7 @@ PassOwnPtr<FontPlatformData> FontCache::createFontPlatformData(const FontDescrip
|
| }
|
| }
|
|
|
| - OwnPtr<FontPlatformData> result = adoptPtr(new FontPlatformData(tf,
|
| + std::unique_ptr<FontPlatformData> result = wrapUnique(new FontPlatformData(tf,
|
| name.data(),
|
| fontSize,
|
| (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDescription.isSyntheticBold(),
|
|
|