Upstream changes from Android

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 76 matching lines @@
     const SkLanguage& getLanguage() const { return fLanguage; }
 
     /** Set the paint's language value used for drawing text.
         @param language set the paint's language value for drawing text.
     */
     void setLanguage(const SkLanguage& language) { fLanguage = language; }
     void setLanguage(const char* languageTag) { fLanguage = SkLanguage(languageTag); }
 
 
     enum FontVariant {
-       kDefault_Variant, // Currently setting yourself to Default gives you Compact Variant
-       kCompact_Variant,
-       kElegant_Variant,
+       kDefault_Variant = 0x01, // Currently setting yourself to Default gives you Compact Variant
+       kCompact_Variant = 0x02,
+       kElegant_Variant = 0x04,
        kLast_Variant = kElegant_Variant,
     };
 
     /** Return the font variant
         @return the font variant used by this paint object
     */
     FontVariant getFontVariant() const { return fFontVariant; }
 
     /** Set the font variant
       @param fontVariant set the paint's font variant for choosing fonts
@@ skipping 10 matching lines @@
     }
 
 private:
     SkLanguage fLanguage;
     FontVariant fFontVariant;
     bool fUseFontFallbacks;
 };
 
 #endif // #ifdef SK_BUILD_FOR_ANDROID
 #endif // #ifndef SkPaintOptionsAndroid_DEFINED