third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinux.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/linux/FontPlatformDataLinux.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:

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/mac/FontPlatformDataMac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinux.cpp

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

index ab507c9d3c5456745dc5c7578dd7ed5387112e90..1f43d31cb87794cf82e6fc7251a7c3dbb67e9b59 100644

--- a/third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinux.cpp

+++ b/third_party/WebKit/Source/platform/fonts/linux/FontPlatformDataLinux.cpp

@@ -29,6 +29,7 @@

#include "platform/fonts/FontPlatformData.h"

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

#include "SkTypeface.h"

@@ -40,7 +41,7 @@ void FontPlatformData::setupPaint(SkPaint* paint, float deviceScaleFactor, const

const float ts = m_textSize >= 0 ? m_textSize : 12;

paint->setTextSize(SkFloatToScalar(ts));

- paint->setTypeface(m_typeface.get());

+ paint->setTypeface(toSkSp(m_typeface));

paint->setFakeBoldText(m_syntheticBold);

paint->setTextSkewX(m_syntheticItalic ? -SK_Scalar1 / 4 : 0);

}