Commit fa968910 authored by Mike Reed's avatar Mike Reed Committed by Commit Bot

switch over to SkStream api change that returns unique_ptrs

Bug: 
Change-Id: I712805c035b704c9a84c9c5a059a4d3481f10a99
Reviewed-on: https://chromium-review.googlesource.com/673506Reviewed-by: default avatarFlorin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@chromium.org>
Cr-Commit-Position: refs/heads/master@{#503163}
parent f4ac2785
......@@ -204,10 +204,6 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
# define SK_USE_LEGACY_DISTANCE_FIELDS
#endif
#ifndef SK_SUPPORT_LEGACY_STREAM_API
#define SK_SUPPORT_LEGACY_STREAM_API
#endif
#ifndef SK_DISABLE_DEFERRED_PROXIES
#define SK_DISABLE_DEFERRED_PROXIES
#endif
......
......@@ -121,7 +121,7 @@ FontPlatformData FontCustomPlatformData::GetFontPlatformData(
}
sk_sp<SkTypeface> sk_variation_font(fm->createFromStream(
base_typeface_->openStream(nullptr)->duplicate(),
base_typeface_->openStream(nullptr)->duplicate().release(),
SkFontMgr::FontParameters().setAxes(axes.data(), axes.size())));
if (sk_variation_font) {
......
......@@ -192,7 +192,7 @@ FontPlatformData::FontPlatformData(NSFont* ns_font,
// TODO crbug.com/670246: Refactor this to a future Skia API that acccepts
// axis parameters on system fonts directly.
typeface_ = sk_sp<SkTypeface>(fm->createFromStream(
typeface_->openStream(nullptr)->duplicate(),
typeface_->openStream(nullptr)->duplicate().release(),
SkFontMgr::FontParameters().setAxes(axes, variation_settings->size())));
}
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment