third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp - Issue 1819753003: Allow various font weights in gfx.

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 1819753003: Allow various font weights in gfx. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use the std::tie in resource_bundle Created 4 years, 8 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 59cd332406b7539fed65aba3e116a4929c30f836..302d7bf4f524bb365763adcabc58ade96a299fa9 100644

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

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

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

// FIXME: Use m_fontManager, SkFontStyle and matchFamilyStyle instead of

// CreateFromName on all platforms.

- return adoptRef(SkTypeface::CreateFromName(name.data(), static_cast<SkTypeface::Style>(style)));

+ const SkFontStyle fontStyle(style);

+ return adoptRef(SkTypeface::CreateFromName(name.data(), fontStyle));

}

#if !OS(WIN)