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

Unified Diff: include/core/SkPaintOptionsAndroid.h

Issue 14972022: Make the use of fallback fonts in Android a runtime decision. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years, 7 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/core/SkPaintOptionsAndroid.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/core/SkPaintOptionsAndroid.h
diff --git a/include/core/SkPaintOptionsAndroid.h b/include/core/SkPaintOptionsAndroid.h
index c38088f730836abe63fc2360d75eb1196d26e434..de2b281f219dfbb00199b24713032e6eed4f6fc5 100644
--- a/include/core/SkPaintOptionsAndroid.h
+++ b/include/core/SkPaintOptionsAndroid.h
@@ -61,16 +61,20 @@ class SkPaintOptionsAndroid {
public:
SkPaintOptionsAndroid() {
fFontVariant = kDefault_Variant;
+ fUseFontFallbacks = false;
}
SkPaintOptionsAndroid& operator=(const SkPaintOptionsAndroid& b) {
fLanguage = b.fLanguage;
fFontVariant = b.fFontVariant;
+ fUseFontFallbacks = b.fUseFontFallbacks;
return *this;
}
bool operator!=(const SkPaintOptionsAndroid& b) const {
- return fLanguage != b.fLanguage || fFontVariant != b.fFontVariant;
+ return fLanguage != b.fLanguage ||
+ fFontVariant != b.fFontVariant ||
+ fUseFontFallbacks != b.fUseFontFallbacks;
}
void flatten(SkFlattenableWriteBuffer&) const;
@@ -108,9 +112,16 @@ public:
fFontVariant = fontVariant;
}
+ bool isUsingFontFallbacks() const { return fUseFontFallbacks; }
+
+ void setUseFontFallbacks(bool useFontFallbacks) {
+ fUseFontFallbacks = useFontFallbacks;
+ }
+
private:
SkLanguage fLanguage;
FontVariant fFontVariant;
+ bool fUseFontFallbacks;
};
#endif // #ifdef SK_BUILD_FOR_ANDROID
« no previous file with comments | « no previous file | src/core/SkPaintOptionsAndroid.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698