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

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

index 06dc6cc8edadaaebf9851b6ed9c4cb3ddf9d2bc8..ff9ce7c2f3cf223c48a6c656d8f365f26496a3f3 100644

--- a/third_party/WebKit/Source/platform/fonts/WebFontDecoder.cpp

+++ b/third_party/WebKit/Source/platform/fonts/WebFontDecoder.cpp

@@ -34,6 +34,7 @@

#include "platform/SharedBuffer.h"

#include "platform/TraceEvent.h"

#include "platform/fonts/FontCache.h"

+#include "platform/graphics/skia/SkiaUtils.h"

#include "public/platform/Platform.h"

#include "third_party/harfbuzz-ng/src/hb.h"

#include "third_party/ots/include/ots-memory-stream.h"

@@ -191,7 +192,7 @@ PassRefPtr<SkTypeface> WebFontDecoder::decode(SharedBuffer* buffer)

#if OS(WIN)

RefPtr<SkTypeface> typeface = adoptRef(FontCache::fontCache()->fontManager()->createFromStream(stream));

#else

- RefPtr<SkTypeface> typeface = adoptRef(SkTypeface::CreateFromStream(stream));

+ RefPtr<SkTypeface> typeface = fromSkSp(SkTypeface::MakeFromStream(stream));

#endif

if (!typeface) {

setErrorString("Not a valid font data");