remove SkFontHost::CreateScalerContext

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 "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;
 
 SkFontConfigInterface* SkFontConfigInterface::RefGlobal() {
     SkAutoMutexAcquire ac(gFontConfigInterfaceMutex);
@@ skipping 18 matching lines @@
     for (;;) {
         SkFontConfigInterface* fci = SkFontConfigInterface::RefGlobal();
         if (fci) {
             return fci;
         }
         fci = SkFontConfigInterface::GetSingletonDirectInterface();
         SkFontConfigInterface::SetGlobal(fci)->unref();
     }
 }
 
-class FontConfigTypeface : public SkTypeface {
+class FontConfigTypeface : public SkTypeface_FreeType {
     SkFontConfigInterface::FontIdentity fIdentity;
     SkString fFamilyName;
     SkStream* fLocalStream;
 
 public:
     FontConfigTypeface(Style style,
                        const SkFontConfigInterface::FontIdentity& fi,
                        const SkString& familyName)
-            : SkTypeface(style, SkTypefaceCache::NewFontID())
+            : INHERITED(style, SkTypefaceCache::NewFontID(), false)
             , fIdentity(fi)
             , fFamilyName(familyName)
             , fLocalStream(NULL) {}
 
     FontConfigTypeface(Style style, SkStream* localStream)
-            : SkTypeface(style, SkTypefaceCache::NewFontID()) {
+            : 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*) const SK_OVERRIDE;
 
 private:
-    typedef SkTypeface INHERITED;
+    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;
@@ skipping 87 matching lines @@
 }
 
 // DEPRECATED
 size_t SkFontHost::GetTableData(SkFontID fontID, SkFontTableTag tag,
                                 size_t offset, size_t length, void* dst) {
     SkTypeface* face = SkTypefaceCache::FindByID(fontID);
     return face ? face->onGetTableData(tag, offset, length, dst) : 0;
 }
 
 // DEPRECATED
-uint32_t SkFontHost::NextLogicalFont(SkFontID curr, SkFontID orig) {
+SkTypeface* SkFontHost::NextLogicalTypeface(SkFontID curr, SkFontID orig) {
     // We don't handle font fallback.
-    return 0;
+    return NULL;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // Serialize, Deserialize need to be compatible across platforms, hence the use
 // of SkFontDescriptor.
 
 void SkFontHost::Serialize(const SkTypeface* face, SkWStream* stream) {
     FontConfigTypeface* fct = (FontConfigTypeface*)face;
 
@@ skipping 93 matching lines @@
     return stream.get()
                 ? SkFontStream::GetTableData(stream, ttcIndex,
                                              tag, offset, length, data)
                 : 0;
 }
 
 void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc) const {
     desc->setStyle(this->style());
     desc->setFamilyName(this->getFamilyName());
 }