Font variations.

src/core/SkFontMgr.cpp

Index: src/core/SkFontMgr.cpp
diff --git a/src/core/SkFontMgr.cpp b/src/core/SkFontMgr.cpp
index a03e05e0e4eae95c7937b7e7f5bac2bfa08d025f..c268afe7e01399eb2fb339d924066a429c2d74e3 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,18 @@ SkTypeface* SkFontMgr::createFromStream(SkStreamAsset* stream, int ttcIndex) con
     return this->onCreateFromStream(stream, ttcIndex);
 }
 
+SkTypeface* SkFontMgr::createFromFontData(SkFontData* data) const {
+    if (NULL == data) {
+        return NULL;
+    }
+    return this->onCreateFromFontData(data);
+}
+
+// This implementation is temporary until it can be made pure virtual.
+SkTypeface* SkFontMgr::onCreateFromFontData(SkFontData* data) const {
+    return this->createFromStream(data->detachStream(), data->getIndex());
+}
+
 SkTypeface* SkFontMgr::createFromFile(const char path[], int ttcIndex) const {
     if (NULL == path) {
         return NULL;