third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp - Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>.

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: third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp

Issue 2290903002: Change (Pass)RefPtr<SkXxx> into sk_sp<SkXxx>. (Closed)

Patch Set: Rebasing... Created 4 years, 3 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/fonts/WebFontDecoder.cpp ('k') | third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp

index c580ac0160534f2202c41b5317689ebc60b9e59e..7fe3bd901ce58f8dc28c6de1f79b3cde85be2744 100644

--- a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp

+++ b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp

@@ -41,7 +41,7 @@ namespace blink {

PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(const FontDescription& fontDescription, UChar32 c, const SimpleFontData*, FontFallbackPriority fallbackPriority)

{

- RefPtr<SkFontMgr> fm = adoptRef(SkFontMgr::RefDefault());

+ sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault());

AtomicString familyName = getFamilyNameForCharacter(fm.get(), c, fontDescription, fallbackPriority);

if (familyName.isEmpty())

return getLastResortFallbackFont(fontDescription, DoNotRetain);

@@ -77,7 +77,7 @@ AtomicString FontCache::getGenericFamilyNameForScript(const AtomicString& family

return familyName;

}

- RefPtr<SkFontMgr> fm = adoptRef(SkFontMgr::RefDefault());

+ sk_sp<SkFontMgr> fm(SkFontMgr::RefDefault());

return getFamilyNameForCharacter(fm.get(), examplerChar, fontDescription, FontFallbackPriority::Text);

}