Move the FontConfigTypeface class into private header.

src/ports/SkFontHost_fontconfig.cpp

 /*
  * Copyright 2008 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontConfigInterface.h"
+#include "SkFontConfigTypeface.h"
 #include "SkFontDescriptor.h"
 #include "SkFontHost.h"
 #include "SkFontHost_FreeType_common.h"
 #include "SkFontStream.h"
 #include "SkStream.h"
 #include "SkTypeface.h"
 #include "SkTypefaceCache.h"
 
 SK_DECLARE_STATIC_MUTEX(gFontConfigInterfaceMutex);
 static SkFontConfigInterface* gFontConfigInterface;
@@ skipping 29 matching lines @@
 }
 
 // export this to SkFontMgr_fontconfig.cpp until this file just goes away.
 SkFontConfigInterface* SkFontHost_fontconfig_ref_global();
 SkFontConfigInterface* SkFontHost_fontconfig_ref_global() {
     return RefFCI();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-class FontConfigTypeface : public SkTypeface_FreeType {
-    SkFontConfigInterface::FontIdentity fIdentity;
-    SkString fFamilyName;
-    SkStream* fLocalStream;
-
-public:
-    FontConfigTypeface(Style style,
-                       const SkFontConfigInterface::FontIdentity& fi,
-                       const SkString& familyName)
-            : INHERITED(style, SkTypefaceCache::NewFontID(), false)
-            , fIdentity(fi)
-            , fFamilyName(familyName)
-            , fLocalStream(NULL) {}
-
-    FontConfigTypeface(Style style, SkStream* localStream)
-            : INHERITED(style, SkTypefaceCache::NewFontID(), false) {
-        // we default to empty fFamilyName and fIdentity
-        fLocalStream = localStream;
-        SkSafeRef(localStream);
-    }
-
-    virtual ~FontConfigTypeface() {
-        SkSafeUnref(fLocalStream);
-    }
-
-    const SkFontConfigInterface::FontIdentity& getIdentity() const {
-        return fIdentity;
-    }
-
-    const char* getFamilyName() const { return fFamilyName.c_str(); }
-    SkStream*   getLocalStream() const { return fLocalStream; }
-
-    bool isFamilyName(const char* name) const {
-        return fFamilyName.equals(name);
-    }
-
-protected:
-    friend class SkFontHost;    // hack until we can make public versions
-
-    virtual int onGetTableTags(SkFontTableTag tags[]) const SK_OVERRIDE;
-    virtual size_t onGetTableData(SkFontTableTag, size_t offset,
-                                  size_t length, void* data) const SK_OVERRIDE;
-    virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
-    virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
-
-private:
-    typedef SkTypeface_FreeType INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
 struct FindRec {
     FindRec(const char* name, SkTypeface::Style style)
         : fFamilyName(name)  // don't need to make a deep copy
         , fStyle(style) {}
 
     const char* fFamilyName;
     SkTypeface::Style fStyle;
 };
 
 static bool find_proc(SkTypeface* face, SkTypeface::Style style, void* ctx) {
@@ skipping 106 matching lines @@
                 : 0;
 }
 
 void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
                                              bool* isLocalStream) const {
     desc->setFamilyName(this->getFamilyName());
     *isLocalStream = SkToBool(this->getLocalStream());
 }
 
 ///////////////////////////////////////////////////////////////////////////////