move impl of AdvancedTypefaceMetrics into typeface (3)

include/core/SkTypeface.h

 
 /*
  * Copyright 2006 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.
  */
 
 
 #ifndef SkTypeface_DEFINED
@@ skipping 190 matching lines @@
     */
     SkTypeface(Style style, SkFontID uniqueID, bool isFixedWidth = false);
     virtual ~SkTypeface();
 
     friend class SkScalerContext;
     static SkTypeface* GetDefaultTypeface();
 
     virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const = 0;
     virtual void onFilterRec(SkScalerContextRec*) const = 0;
 
+    virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(

[bungeman-skia, 2013/03/20 17:56:26]

public??? ick.

It seems this is currently being used by

chromium/src/third_party/WebKit/Source/WebCore/platform/graphics/harfbuzz/FontPlatformDataHarfBuzz.cpp

just to get the em size. Which is ridiculous because we have an onGetUPEM, and
because of the amount of work being thrown away.

The other user is

chromium/src/printing/pdf_metafile_skia.cc

which is using SkAdvancedTypefaceMetrics::kNotEmbeddable_Font as if it were
named SkAdvancedTypefaceMetrics::kCount_Font just to make a histogram.

+                        SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
+                        const uint32_t* glyphIDs,
+                        uint32_t glyphIDsCount) const = 0;
+        
     virtual int onGetUPEM() const;
     virtual int onGetTableTags(SkFontTableTag tags[]) const;
     virtual size_t onGetTableData(SkFontTableTag, size_t offset,
                                   size_t length, void* data) const;
     virtual void onGetFontDescriptor(SkFontDescriptor*) const;
 
 private:
     SkFontID    fUniqueID;
     Style       fStyle;
     bool        fIsFixedWidth;
 
     friend class SkPaint;
     friend class SkGlyphCache;  // GetDefaultTypeface
     // just so deprecated fonthost can call protected methods
     friend class SkFontHost;
 
     typedef SkWeakRefCnt INHERITED;
 };
 
 #endif