Expose API for gx font variation axes.

src/core/SkFontMgr.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontDescriptor.h"
 #include "SkFontMgr.h"
 #include "SkOncePtr.h"
@@ skipping 114 matching lines @@
     return this->onCreateFromData(data, ttcIndex);
 }
 
 SkTypeface* SkFontMgr::createFromStream(SkStreamAsset* stream, int ttcIndex) const {
     if (nullptr == stream) {
         return nullptr;
     }
     return this->onCreateFromStream(stream, ttcIndex);
 }
 
+SkTypeface* SkFontMgr::createFromStream(SkStreamAsset* stream, const FontParameters& params) const {
+    if (nullptr == stream) {
+        return nullptr;
+    }
+    return this->onCreateFromStream(stream, params);
+}
+
 SkTypeface* SkFontMgr::createFromFontData(SkFontData* data) const {
     if (nullptr == data) {
         return nullptr;
     }
     return this->onCreateFromFontData(data);
 }
 
 // This implementation is temporary until it can be made pure virtual.
+SkTypeface* SkFontMgr::onCreateFromStream(SkStreamAsset* stream, const FontParameters& p) const {
+    return this->createFromStream(stream, p.getCollectionIndex());
+}
+
+// This implementation is temporary until it can be made pure virtual.
 SkTypeface* SkFontMgr::onCreateFromFontData(SkFontData* data) const {
     SkTypeface* ret = this->createFromStream(data->detachStream(), data->getIndex());
     delete data;
     return ret;
 }
 
 SkTypeface* SkFontMgr::createFromFile(const char path[], int ttcIndex) const {
     if (nullptr == path) {
         return nullptr;
     }
@@ skipping 106 matching lines @@
             }
         }
 
         if (currentScore.score > maxScore.score) {
             maxScore = currentScore;
         }
     }
 
     return this->createTypeface(maxScore.index);
 }