AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove SK_SUPPORT_LEGACY_TYPEFACE_MAKEFROMSTREAM

Browse Source 
... now that Brian updated Flutter's callsites

Bug: skia:8350
Change-Id: I5ae72700125e09d84392eee8045c9602f718909a
Reviewed-on: https://skia-review.googlesource.com/153901
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Auto-Submit: Mike Reed <reed@google.com>
This commit is contained in:
Mike Reed 2018-09-12 10:51:05 -04:00 committed by Skia Commit-Bot
parent 2700abc4cb
commit 558fabb31c
3 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gn/flutter_defines.gni
View File

@ -7,5 +7,4 @@ flutter_defines = [
"SK_DISABLE_RENDER_TARGET_SORTING",
"SK_SUPPORT_LEGACY_VULKAN_INTERFACE",
"SK_LEGACY_SKCODEC_NONE_ENUM",
"SK_SUPPORT_LEGACY_TYPEFACE_MAKEFROMSTREAM",
]

5
include/core/SkTypeface.h
View File

@ -129,11 +129,6 @@ public:
*/
static sk_sp<SkTypeface> MakeFromStream(std::unique_ptr<SkStreamAsset> stream, int index = 0);
#ifdef SK_SUPPORT_LEGACY_TYPEFACE_MAKEFROMSTREAM
// DEPRECATED -- call the version that takes unique_ptr
static sk_sp<SkTypeface> MakeFromStream(SkStreamAsset* stream, int index = 0);
#endif
/** Return a new typeface given a SkData. If the data is null, or is not a valid font file,
* returns nullptr.
*/

7
src/core/SkTypeface.cpp
View File

@ -145,13 +145,6 @@ sk_sp<SkTypeface> SkTypeface::MakeFromName(const char name[],
return SkFontMgr::RefDefault()->legacyMakeTypeface(name, fontStyle);
}
#ifdef SK_SUPPORT_LEGACY_TYPEFACE_MAKEFROMSTREAM
// DEPRECATED
sk_sp<SkTypeface> SkTypeface::MakeFromStream(SkStreamAsset* stream, int index) {
return MakeFromStream(std::unique_ptr<SkStreamAsset>(stream), index);
}
#endif
sk_sp<SkTypeface> SkTypeface::MakeFromStream(std::unique_ptr<SkStreamAsset> stream, int index) {
if (!stream) {
return nullptr;