Remove filename from SkFontDescriptor.

src/ports/SkFontMgr_android.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigParser_android.h"
 #include "SkFontDescriptor.h"
 #include "SkFontHost_FreeType_common.h"
@@ skipping 48 matching lines @@
         : INHERITED(index, style, isFixedPitch, familyName)
         , fPathName(pathName)
         , fLang(lang)
         , fVariantStyle(variantStyle) { }
 
     virtual void onGetFontDescriptor(SkFontDescriptor* desc,
                                      bool* serialize) const override {
         SkASSERT(desc);
         SkASSERT(serialize);
         desc->setFamilyName(fFamilyName.c_str());
-        desc->setFontFileName(fPathName.c_str());
         desc->setFontIndex(fIndex);
         *serialize = false;
     }
     SkStreamAsset* onOpenStream(int* ttcIndex) const override {
         *ttcIndex = fIndex;
         return SkStream::NewFromFile(fPathName.c_str());
     }
 
     const SkString fPathName;
     const SkLanguage fLang;
@@ skipping 10 matching lines @@
                              bool isFixedPitch,
                              const SkString& familyName)
         : INHERITED(index, style, isFixedPitch, familyName)
         , fStream(stream) { }
 
     virtual void onGetFontDescriptor(SkFontDescriptor* desc,
                                      bool* serialize) const override {
         SkASSERT(desc);
         SkASSERT(serialize);
         desc->setFamilyName(fFamilyName.c_str());
-        desc->setFontFileName(NULL);
         *serialize = true;
     }
 
     SkStreamAsset* onOpenStream(int* ttcIndex) const override {
         *ttcIndex = fIndex;
         return fStream->duplicate();
     }
 
 private:
     SkAutoTDelete<SkStreamAsset> fStream;
@@ skipping 429 matching lines @@
 {
     gTestFontsXml = fontsXml;
     gTestFallbackFontsXml = fallbackFontsXml;
     gTestBasePath = basePath;
     SkASSERT(gTestFontsXml);
     SkASSERT(gTestFallbackFontsXml);
     SkASSERT(gTestBasePath);
     SkDEBUGF(("Test BasePath: %s Fonts: %s FallbackFonts: %s\n",
               gTestBasePath, gTestFontsXml, gTestFallbackFontsXml));
 }