Font variations.

src/core/SkFontMgr.cpp

Index: src/core/SkFontMgr.cpp
diff --git a/src/core/SkFontMgr.cpp b/src/core/SkFontMgr.cpp
index 4e0f549896c58abde1bcd7854eb48202b0381cdf..9ae885de7204fdeda78c4f69081490cc2c4aa5c0 100644
--- a/src/core/SkFontMgr.cpp
+++ b/src/core/SkFontMgr.cpp
@@ -5,6 +5,7 @@
  * found in the LICENSE file.
  */
 
+#include "SkFontDescriptor.h"
 #include "SkFontMgr.h"
 #include "SkLazyPtr.h"
 #include "SkStream.h"
@@ -133,6 +134,17 @@ SkTypeface* SkFontMgr::createFromStream(SkStreamAsset* stream, int ttcIndex) con
     return this->onCreateFromStream(stream, ttcIndex);
 }
 
+SkTypeface* SkFontMgr::createFromStream(SkStreamAsset* stream, const SkFontParameters& params) const {
+    if (NULL == stream) {
+        return NULL;
+    }
+    return this->onCreateFromStream(stream, params);
+}
+
+SkTypeface* SkFontMgr::onCreateFromStream(SkStreamAsset* stream, const SkFontParameters& params) const {

[bungeman-skia, 2015/03/23 21:59:05]

These are just the base 'default' shims to keep existing SkFontMgrs working.

+    return this->onCreateFromStream(stream, params.fIndex);
+}
+
 SkTypeface* SkFontMgr::createFromFile(const char path[], int ttcIndex) const {
     if (NULL == path) {
         return NULL;