Bug 910754 - skia-npapi's anp_getFontPath() function doesn't work with upstream Skia anymore, and it looks like we don't need it to be implemented anyway r=snorp
authorGeorge Wright <gw@gwright.org.uk>
Thu, 05 Dec 2013 23:02:09 -0500
changeset 169771 0c3c16ea5cd3b0e5d907ed3d69b9990a394d71a5
parent 169770 5d933587c7263c4f8bccd479b4108fb33076ae95
child 169772 56474b57c3b87180fca578d0ab78f2174acc8beb
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
reviewerssnorp
bugs910754
milestone30.0a1
Bug 910754 - skia-npapi's anp_getFontPath() function doesn't work with upstream Skia anymore, and it looks like we don't need it to be implemented anyway r=snorp
other-licenses/skia-npapi/ANPTypeface.cpp
--- a/other-licenses/skia-npapi/ANPTypeface.cpp
+++ b/other-licenses/skia-npapi/ANPTypeface.cpp
@@ -56,23 +56,27 @@ static void anp_unref(ANPTypeface* tf) {
 static ANPTypefaceStyle anp_getStyle(const ANPTypeface* tf) {
     SkTypeface::Style s = tf ? tf->style() : SkTypeface::kNormal;
     return static_cast<ANPTypefaceStyle>(s);
 }
 
 static int32_t anp_getFontPath(const ANPTypeface* tf, char fileName[],
                                int32_t length, int32_t* index) {
     SkStream* stream = tf->openStream(index);
+
+    return 0;
+    /*
     if (stream->getFileName()) {
       strcpy(fileName, stream->getFileName());
     } else {
       return 0;
     }
 
     return strlen(fileName);
+    */
 }
 
 static const char* gFontDir;
 #define FONT_DIR_SUFFIX     "/fonts/"
 
 static const char* anp_getFontDirectoryPath() {
     if (NULL == gFontDir) {
         const char* root = getenv("ANDROID_ROOT");