Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(278)

Unified Diff: src/ports/SkFontConfigParser_android.h

Issue 1092093002: Respect declared font style on Android. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Explicitly default the style to Auto. Created 5 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | src/ports/SkFontConfigParser_android.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkFontConfigParser_android.h
diff --git a/src/ports/SkFontConfigParser_android.h b/src/ports/SkFontConfigParser_android.h
index 6dbf38359097a47539642ee10e337619ed5275bc..9475cbe1a61f94688797fbb51e33824d41a41b47 100644
--- a/src/ports/SkFontConfigParser_android.h
+++ b/src/ports/SkFontConfigParser_android.h
@@ -62,11 +62,12 @@ typedef uint32_t FontVariant;
// Must remain trivially movable (can be memmoved).
struct FontFileInfo {
- FontFileInfo() : fIndex(0), fWeight(0) { }
+ FontFileInfo() : fIndex(0), fWeight(0), fStyle(Style::Auto) { }
SkString fFileName;
int fIndex;
int fWeight;
+ enum class Style { Auto, Normal, Italic } fStyle;
scroggo 2015/04/17 19:06:49 nit: Why does this not follow our enum naming conv
bungeman-skia 2015/04/17 20:12:49 Done. Updated docs to have example of 'enum class'
};
/**
« no previous file with comments | « no previous file | src/ports/SkFontConfigParser_android.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698