move impl of AdvancedTypefaceMetrics into typeface (3)

src/ports/SkFontHost_simple.cpp

 
 /*
  * Copyright 2011 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkFontHost.h"
@@ skipping 242 matching lines @@
             detach_and_delete_family(family);
         }
     }
 
     bool isSysFont() const { return fIsSysFont; }
 
     virtual SkStream* openStream() = 0;
     virtual const char* getUniqueString() const = 0;
     virtual const char* getFilePath() const = 0;
 
+protected:
+    virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
+                                    SkAdvancedTypefaceMetrics::PerGlyphInfo,
+                                    const uint32_t*,
+                                    uint32_t) const SK_OVERRIDE {
+        return NULL;
+    }
+    
 private:
     bool    fIsSysFont;
 
     typedef SkTypeface INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class StreamTypeface : public FamilyTypeface {
 public:
@@ skipping 272 matching lines @@
     FamilyTypeface* tf = (FamilyTypeface*)find_from_uniqueID(fontID);
     SkStream* stream = tf ? tf->openStream() : NULL;
 
     if (stream && stream->getLength() == 0) {
         stream->unref();
         stream = NULL;
     }
     return stream;
 }
 
-#if 0
-SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics(
-        uint32_t fontID,
-        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
-        const uint32_t* glyphIDs,
-        uint32_t glyphIDsCount) {
-    SkDEBUGFAIL("SkFontHost::GetAdvancedTypefaceMetrics unimplemented");
-    return NULL;
-}
-#endif
-
 size_t SkFontHost::GetFileName(SkFontID fontID, char path[], size_t length,
                                int32_t* index) {
     SkAutoMutexAcquire  ac(gFamilyMutex);
 
     FamilyTypeface* tf = (FamilyTypeface*)find_from_uniqueID(fontID);
     const char* src = tf ? tf->getFilePath() : NULL;
 
     if (src) {
         size_t size = strlen(src);
         if (path) {
@@ skipping 37 matching lines @@
         return SkNEW_ARGS(StreamTypeface, (style, false, NULL, stream));
     } else {
         return NULL;
     }
 }
 
 SkTypeface* SkFontHost::CreateTypefaceFromFile(const char path[]) {
     SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path));
     return stream.get() ? SkFontHost::CreateTypefaceFromStream(stream) : NULL;
 }