remove SkFontHost::CreateScalerContext

src/ports/SkFontHost_mac.cpp

 
 /*
  * 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.
  */
 
 #include <vector>
 #ifdef SK_BUILD_FOR_MAC
@@ skipping 592 matching lines @@
 
 struct GlyphRect {
     int16_t fMinX;
     int16_t fMinY;
     int16_t fMaxX;
     int16_t fMaxY;
 };
 
 class SkScalerContext_Mac : public SkScalerContext {
 public:
-    SkScalerContext_Mac(const SkDescriptor* desc);
-    virtual ~SkScalerContext_Mac(void);
+    SkScalerContext_Mac(SkTypeface_Mac*, const SkDescriptor*);
+    virtual ~SkScalerContext_Mac();
 
 
 protected:
     unsigned generateGlyphCount(void) SK_OVERRIDE;
     uint16_t generateCharToGlyph(SkUnichar uni) SK_OVERRIDE;
     void generateAdvance(SkGlyph* glyph) SK_OVERRIDE;
     void generateMetrics(SkGlyph* glyph) SK_OVERRIDE;
     void generateImage(const SkGlyph& glyph) SK_OVERRIDE;
     void generatePath(const SkGlyph& glyph, SkPath* path) SK_OVERRIDE;
     void generateFontMetrics(SkPaint::FontMetrics* mX, SkPaint::FontMetrics* mY) SK_OVERRIDE;
@@ skipping 14 matching lines @@
     AutoCFRelease<CTFontRef> fCTVerticalFont; // for vertical advance
     AutoCFRelease<CGFontRef> fCGFont;
     GlyphRect* fFBoundingBoxes;
     uint16_t fFBoundingBoxesGlyphOffset;
     uint16_t fGlyphCount;
     bool fGeneratedFBoundingBoxes;
     bool fDoSubPosition;
     bool fVertical;
 
     friend class Offscreen;
+
+    typedef SkScalerContext INHERITED;
 };
 
-SkScalerContext_Mac::SkScalerContext_Mac(const SkDescriptor* desc)
-        : SkScalerContext(desc)
+SkScalerContext_Mac::SkScalerContext_Mac(SkTypeface_Mac* typeface,
+                                         const SkDescriptor* desc)
+        : INHERITED(typeface, desc)
         , fFBoundingBoxes(NULL)
         , fFBoundingBoxesGlyphOffset(0)
         , fGeneratedFBoundingBoxes(false)
 {
     CTFontRef ctFont = GetFontRefFromFontID(fRec.fFontID);
     CFIndex numGlyphs = CTFontGetGlyphCount(ctFont);
 
     // Get the state we need
     fRec.getSingleMatrix(&fMatrix);
     fUnitMatrix = fMatrix;
@@ skipping 1043 matching lines @@
     // for now, we just want to skip it.
     size_t size = stream->readPackedUInt();
     stream->skip(size);
 
     return SkFontHost::CreateTypeface(NULL, desc.getFamilyName(), desc.getStyle());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 // DEPRECATED
-SkScalerContext* SkFontHost::CreateScalerContext(const SkDescriptor* desc) {
-    return new SkScalerContext_Mac(desc);
-}
-
-// DEPRECATED
-SkFontID SkFontHost::NextLogicalFont(SkFontID currFontID, SkFontID origFontID) {
-    SkFontID nextFontID = 0;
+SkTypeface* SkFontHost::NextLogicalTypeface(SkFontID currFontID, SkFontID origFontID) {
     SkTypeface* face = GetDefaultFace();
-    if (face->uniqueID() != currFontID) {
-        nextFontID = face->uniqueID();
+    if (face->uniqueID() == currFontID) {
+        face = NULL;
     }
-    return nextFontID;
-}
-
-// DEPRECATED
-void SkFontHost::FilterRec(SkScalerContext::Rec* rec, SkTypeface* face) {
-    face->onFilterRec(rec);
+    return SkSafeRef(face);
 }
 
 // DEPRECATED
 int SkFontHost::CountTables(SkFontID fontID) {
     SkTypeface* face = SkTypefaceCache::FindByID(fontID);
     return face ? face->onGetTableTags(NULL) : 0;
 }
 
 // DEPRECATED
 int SkFontHost::GetTableTags(SkFontID fontID, SkFontTableTag tags[]) {
@@ skipping 65 matching lines @@
     if (length > srcSize - offset) {
         length = srcSize - offset;
     }
     if (dstData) {
         memcpy(dstData, CFDataGetBytePtr(srcData) + offset, length);
     }
     return length;
 }
 
 SkScalerContext* SkTypeface_Mac::onCreateScalerContext(const SkDescriptor* desc) const {
-    return new SkScalerContext_Mac(desc);
+    return new SkScalerContext_Mac(const_cast<SkTypeface_Mac*>(this), desc);
 }
 
 void SkTypeface_Mac::onFilterRec(SkScalerContextRec* rec) const {
     unsigned flagsWeDontSupport = SkScalerContext::kDevKernText_Flag |
                                   SkScalerContext::kAutohinting_Flag;
 
     rec->fFlags &= ~flagsWeDontSupport;
 
     bool lcdSupport = supports_LCD();
 
@@ skipping 58 matching lines @@
 }
 
 void SkTypeface_Mac::onGetFontDescriptor(SkFontDescriptor* desc) const {
     this->INHERITED::onGetFontDescriptor(desc);
     SkString tmpStr;
 
     desc->setFamilyName(get_str(CTFontCopyFamilyName(fFontRef), &tmpStr));
     desc->setFullName(get_str(CTFontCopyFullName(fFontRef), &tmpStr));
     desc->setPostscriptName(get_str(CTFontCopyPostScriptName(fFontRef), &tmpStr));
 }