third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp - Issue 2037133002: SkFontConfigInterface createTypeface to makeTypeface.

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 2037133002: SkFontConfigInterface createTypeface to makeTypeface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: move comes from utility. 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:

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

Download patch

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 780d5675245257450b0af5714daf1d93716f5652..9cd14249aeded8b95df5c3257acb794f750b749f 100644

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

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

@@ -38,6 +38,7 @@

#include "platform/fonts/FontDescription.h"

#include "platform/fonts/FontFaceCreationParams.h"

#include "platform/fonts/SimpleFontData.h"

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

#include "public/platform/Platform.h"

#include "public/platform/linux/WebSandboxSupport.h"

#include "wtf/Assertions.h"

@@ -54,7 +55,7 @@ static PassRefPtr<SkTypeface> typefaceForFontconfigInterfaceIdAndTtcIndex(int fo

SkFontConfigInterface::FontIdentity fontIdentity;

fontIdentity.fID = fontconfigInterfaceId;

fontIdentity.fTTCIndex = ttcIndex;

- return adoptRef(fci->createTypeface(fontIdentity));

+ return blink::fromSkSp(fci->makeTypeface(fontIdentity));

}

#endif

« content/common/font_config_ipc_linux.h ('K') | « content/common/font_config_ipc_linux.cc ('k') | no next file » | no next file with comments »