SkFontMgr for Android.

src/core/SkScalerContext.cpp

Index: src/core/SkScalerContext.cpp
diff --git a/src/core/SkScalerContext.cpp b/src/core/SkScalerContext.cpp
index b18dc1a79c3112d7d1a532771548af9b66f60150..603db550e0def94e55cc9720ae1f08b4bc46ba01 100644
--- a/src/core/SkScalerContext.cpp
+++ b/src/core/SkScalerContext.cpp
@@ -170,24 +170,11 @@ SkScalerContext* SkScalerContext::allocNextContext() const {
 #endif
 }
 
-/*  Return the next context, creating it if its not already created, but return
-    NULL if the fonthost says there are no more fonts to fallback to.
+/*  Return the next context.

[djsollen, 2014/07/22 18:18:29]

add this back!

[bungeman-skia, 2014/07/22 18:48:16]

Done.

+    When we supported fallback fonts on Android, this is where we might create new contexts.
  */
 SkScalerContext* SkScalerContext::getNextContext() {
-    SkScalerContext* next = fNextContext;
-    // if next is null, then either it isn't cached yet, or we're at the
-    // end of our possible chain
-    if (NULL == next) {
-        next = this->allocNextContext();
-        if (NULL == next) {
-            return NULL;
-        }
-        // next's base is our base + our local count
-        next->setBaseGlyphCount(fBaseGlyphCount + this->getGlyphCount());
-        // cache the answer
-        fNextContext = next;
-    }
-    return next;
+    return fNextContext;
 }
 
 SkScalerContext* SkScalerContext::getGlyphContext(const SkGlyph& glyph) {