src/ports/SkFontMgr_android.cpp - Issue 2206633004: Move off SK_SUPPORT_LEGACY_DATA_FACTORIES.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/ports/SkFontMgr_android.cpp

Issue 2206633004: Move off SK_SUPPORT_LEGACY_DATA_FACTORIES. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Gotta catch 'em all. Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/ports/SkFontMgr_android.cpp

diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp

index 23c950d01d2f53dc297b2a6ba8c16d6932dce717..94d114d07a48bd2e78f3c251afac0d4e0aa9272b 100644

--- a/src/ports/SkFontMgr_android.cpp

+++ b/src/ports/SkFontMgr_android.cpp

@@ -75,8 +75,8 @@ public:

SkStreamAsset* createStream() const {

if (fFile) {

- SkData* data = SkData::NewFromFILE(fFile);

- return data ? new SkMemoryStream(data) : nullptr;

+ sk_sp<SkData> data(SkData::MakeFromFILE(fFile));

+ return data ? new SkMemoryStream(std::move(data)) : nullptr;

}

return SkStream::NewFromFile(fPathName.c_str());

}