1 files changed, 4 insertions, 3 deletions
diff --git a/skia/ext/SkFontHost_fontconfig_direct.h b/skia/ext/SkFontHost_fontconfig_direct.h
index 8606523..e338633 100644
--- a/skia/ext/SkFontHost_fontconfig_direct.h
+++ b/skia/ext/SkFontHost_fontconfig_direct.h
@@ -30,15 +30,16 @@ class FontConfigDirect : public FontConfigInterface {
     FontConfigDirect();
 
     // FontConfigInterface implementation. Thread safe.
-    virtual bool Match(std::string* result_family, unsigned* result_fileid,
-                       bool fileid_valid, unsigned fileid,
+    virtual bool Match(std::string* result_family, unsigned* result_filefaceid,
+                       bool filefaceid_valid, unsigned filefaceid,
                        const std::string& family,
                        const void* characters, size_t characters_bytes,
                        bool* is_bold, bool* is_italic);
-    virtual int Open(unsigned fileid);
+    virtual int Open(unsigned filefaceid);
 
   private:
     SkMutex mutex_;
+    // fileid stored in two maps below are unique per font file.
     std::map<unsigned, std::string> fileid_to_filename_;
     std::map<std::string, unsigned> filename_to_fileid_;
     unsigned next_file_id_;