third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp - Issue 2066323002: Remove SK_SUPPORT_LEGACY_TYPEFACE_PTR

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/skia/FontCacheSkia.cpp

Issue 2066323002: Remove SK_SUPPORT_LEGACY_TYPEFACE_PTR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: moar Mac fixes Created 4 years, 6 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: third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

index 9cd14249aeded8b95df5c3257acb794f750b749f..9e92232df4c882048c24d1c802a32381ef4df3cd 100644

--- a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

+++ b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

@@ -161,7 +161,7 @@ PassRefPtr<SkTypeface> FontCache::createTypeface(const FontDescription& fontDesc

if (creationParams.creationType() == CreateFontByFciIdAndTtcIndex) {

if (Platform::current()->sandboxSupport())

return typefaceForFontconfigInterfaceIdAndTtcIndex(creationParams.fontconfigInterfaceId(), creationParams.ttcIndex());

- return adoptRef(SkTypeface::CreateFromFile(creationParams.filename().data(), creationParams.ttcIndex()));

+ return fromSkSp(SkTypeface::MakeFromFile(creationParams.filename().data(), creationParams.ttcIndex()));

}

#endif