third_party/WebKit/Source/platform/fonts/FontDescription.h - Issue 1740593002: Use Skia's matchFamilyStyleCharacter API for font fallback

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/FontDescription.h

Issue 1740593002: Use Skia's matchFamilyStyleCharacter API for font fallback (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge Created 4 years, 9 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/FontCache.cpp ('k') | third_party/WebKit/Source/platform/fonts/FontDescription.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/FontDescription.h

diff --git a/third_party/WebKit/Source/platform/fonts/FontDescription.h b/third_party/WebKit/Source/platform/fonts/FontDescription.h

index a382603cb76c036e428ac7b17a9d8cb10317096d..22f106921285ec310cc945485379e45ceefa24d5 100644

--- a/third_party/WebKit/Source/platform/fonts/FontDescription.h

+++ b/third_party/WebKit/Source/platform/fonts/FontDescription.h

@@ -25,6 +25,7 @@

#ifndef FontDescription_h

#define FontDescription_h

+#include "SkFontStyle.h"

#include "platform/FontFamilyNames.h"

#include "platform/fonts/FontCacheKey.h"

#include "platform/fonts/FontFamily.h"

@@ -231,6 +232,8 @@ public:

unsigned bitmapFields() const { return m_fieldsAsUnsigned[0]; }

unsigned auxiliaryBitmapFields() const { return m_fieldsAsUnsigned[1]; }

+ SkFontStyle skiaFontStyle() const;

private:

FontFamily m_familyList; // The list of font families to be used.

RefPtr<FontFeatureSettings> m_featureSettings;