Font variations.

src/ports/SkFontMgr_android.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigParser_android.h"
 #include "SkFontDescriptor.h"
 #include "SkFontHost_FreeType_common.h"
@@ skipping 33 matching lines @@
     SkString fFamilyName;
 
 private:
     typedef SkTypeface_FreeType INHERITED;
 };
 
 class SkTypeface_AndroidSystem : public SkTypeface_Android {
 public:
     SkTypeface_AndroidSystem(const SkString& pathName,
                              int index,
+                             const SkTArray<SkFixed, true>& axes,
                              const SkFontStyle& style,
                              bool isFixedPitch,
                              const SkString& familyName,
                              const SkLanguage& lang,
                              FontVariant variantStyle)
         : INHERITED(index, style, isFixedPitch, familyName)
         , fPathName(pathName)
         , fLang(lang)
-        , fVariantStyle(variantStyle) { }
+        , fVariantStyle(variantStyle)
+        , fAxes(axes) { }
 
     virtual void onGetFontDescriptor(SkFontDescriptor* desc,
                                      bool* serialize) const SK_OVERRIDE {
         SkASSERT(desc);
         SkASSERT(serialize);
         desc->setFamilyName(fFamilyName.c_str());
         desc->setFontFileName(fPathName.c_str());
-        desc->setFontIndex(fIndex);
+        desc->getFontParameters().fIndex = fIndex;
         *serialize = false;
     }
     SkStreamAsset* onOpenStream(int* ttcIndex) const SK_OVERRIDE {
         *ttcIndex = fIndex;
         return SkStream::NewFromFile(fPathName.c_str());
     }
+    SkStreamAsset* onOpenStream2(SkFontParameters* params) const SK_OVERRIDE {
+        params->fIndex = fIndex;
+        params->fAxis.reset(fAxes.count());
+        for (int i = 0 ; i < fAxes.count(); ++i) {
+            params->fAxis[i] = fAxes[i];
+        }
+        return SkStream::NewFromFile(fPathName.c_str());
+    }
 
     const SkString fPathName;
     const SkLanguage fLang;
     const FontVariant fVariantStyle;
+    const SkTArray<SkFixed, true> fAxes;
 
     typedef SkTypeface_Android INHERITED;
 };
 
 class SkTypeface_AndroidStream : public SkTypeface_Android {
 public:
     SkTypeface_AndroidStream(SkStreamAsset* stream,
                              int index,
                              const SkFontStyle& style,
                              bool isFixedPitch,
@@ skipping 65 matching lines @@
             }
 
             // The first specified family name overrides the family name found in the font.
             // TODO: SkTypeface_AndroidSystem::onCreateFamilyNameIterator should return
             // all of the specified family names in addition to the names found in the font.
             if (cannonicalFamilyName != NULL) {
                 familyName = *cannonicalFamilyName;
             }
 
             fStyles.push_back().reset(SkNEW_ARGS(SkTypeface_AndroidSystem,
-                                                 (pathName, ttcIndex,
+                                                 (pathName, ttcIndex, fontFile.fAxes,
                                                   style, isFixedWidth, familyName,
                                                   lang, variant)));
         }
     }
 
     int count() SK_OVERRIDE {
         return fStyles.count();
     }
     void getStyle(int index, SkFontStyle* style, SkString* name) SK_OVERRIDE {
         if (index < 0 || fStyles.count() <= index) {
@@ skipping 363 matching lines @@
 {
     gTestFontsXml = fontsXml;
     gTestFallbackFontsXml = fallbackFontsXml;
     gTestBasePath = basePath;
     SkASSERT(gTestFontsXml);
     SkASSERT(gTestFallbackFontsXml);
     SkASSERT(gTestBasePath);
     SkDEBUGF(("Test BasePath: %s Fonts: %s FallbackFonts: %s\n",
               gTestBasePath, gTestFontsXml, gTestFallbackFontsXml));
 }