Make the use of fallback fonts in Android a runtime decision.

include/core/SkPaintOptionsAndroid.h

 
 /*
  * Copyright 2012 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPaintOptionsAndroid_DEFINED
@@ skipping 43 matching lines @@
 
 private:
     //! BCP 47 language identifier
     SkString fTag;
 };
 
 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;
     void unflatten(SkFlattenableReadBuffer&);
 
     /** Return the paint's language value used for drawing text.
         @return the paint's language value used for drawing text.
     */
     const SkLanguage& getLanguage() const { return fLanguage; }
 
@@ skipping 17 matching lines @@
     FontVariant getFontVariant() const { return fFontVariant; }
 
     /** Set the font variant
       @param fontVariant set the paint's font variant for choosing fonts
     */
     void setFontVariant(FontVariant fontVariant) {
         SkASSERT((unsigned)fontVariant <= kLast_Variant);
         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
 #endif // #ifndef SkPaintOptionsAndroid_DEFINED