Force all font backends to override onGetFontDescriptor, so we can

src/ports/SkFontHost_win.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 "SkAdvancedTypefaceMetrics.h"
 #include "SkBase64.h"
@@ skipping 198 matching lines @@
         call_ensure_accessible(static_cast<const LogFontTypeface*>(face)->fLogFont);
     }
 
 protected:
     virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
     virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE;
     virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE;
     virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
                                 SkAdvancedTypefaceMetrics::PerGlyphInfo,
                                 const uint32_t*, uint32_t) const SK_OVERRIDE;
+    virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
 };
 
 class FontMemResourceTypeface : public LogFontTypeface {
 public:
     /**
      *  Takes ownership of fontMemResource.
      */
     FontMemResourceTypeface(SkTypeface::Style style, SkFontID fontID, const LOGFONT& lf, HANDLE fontMemResource) :
         LogFontTypeface(style, fontID, lf, true), fFontMemResource(fontMemResource) {
     }
@@ skipping 1043 matching lines @@
 static void tchar_to_skstring(const TCHAR* t, SkString* s) {
 #ifdef UNICODE
     size_t sSize = WideCharToMultiByte(CP_UTF8, 0, t, -1, NULL, 0, NULL, NULL);
     s->resize(sSize);
     WideCharToMultiByte(CP_UTF8, 0, t, -1, s->writable_str(), sSize, NULL, NULL);
 #else
     s->set(t);
 #endif
 }
 
-void SkFontHost::Serialize(const SkTypeface* rawFace, SkWStream* stream) {
-    const LogFontTypeface* face = static_cast<const LogFontTypeface*>(rawFace);
-    SkFontDescriptor descriptor(face->style());
-
+void LogFontTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
+                                          bool* isLocalStream) const {
     // Get the actual name of the typeface. The logfont may not know this.
-    HFONT font = CreateFontIndirect(&face->fLogFont);
+    HFONT font = CreateFontIndirect(&fLogFont);
 
     HDC deviceContext = ::CreateCompatibleDC(NULL);
     HFONT savefont = (HFONT)SelectObject(deviceContext, font);
 
     int fontNameLen; //length of fontName in TCHARS.
     if (0 == (fontNameLen = GetTextFace(deviceContext, 0, NULL))) {
-        LogFontTypeface::EnsureAccessible(rawFace);
+        call_ensure_accessible(fLogFont);
         if (0 == (fontNameLen = GetTextFace(deviceContext, 0, NULL))) {
             fontNameLen = 0;
         }
     }
 
     SkAutoSTArray<LF_FULLFACESIZE, TCHAR> fontName(fontNameLen+1);
     if (0 == GetTextFace(deviceContext, fontNameLen, fontName.get())) {
-        LogFontTypeface::EnsureAccessible(rawFace);
+        call_ensure_accessible(fLogFont);
         if (0 == GetTextFace(deviceContext, fontNameLen, fontName.get())) {
             fontName[0] = 0;
         }
     }
 
     if (deviceContext) {
         ::SelectObject(deviceContext, savefont);
         ::DeleteDC(deviceContext);
     }
     if (font) {
         ::DeleteObject(font);
     }
 
     SkString familyName;
     tchar_to_skstring(fontName.get(), &familyName);
-    descriptor.setFamilyName(familyName.c_str());
-    //TODO: FileName and PostScriptName currently unsupported.
 
-    descriptor.serialize(stream);
-
-    if (face->fSerializeAsStream) {
-        // store the entire font in the fontData
-        SkAutoTUnref<SkStream> fontStream(face->openStream(NULL));
-        if (fontStream.get()) {
-            const uint32_t length = fontStream->getLength();
-            stream->writePackedUInt(length);
-            stream->writeStream(fontStream, length);
-        } else {
-            stream->writePackedUInt(0);
-        }
-    } else {
-        stream->writePackedUInt(0);
-    }
-}
-
-SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
-    SkFontDescriptor descriptor(stream);
-
-    const uint32_t customFontDataLength = stream->readPackedUInt();
-    if (customFontDataLength > 0) {
-        // generate a new stream to store the custom typeface
-        SkAutoTUnref<SkMemoryStream> fontStream(SkNEW_ARGS(SkMemoryStream, (customFontDataLength - 1)));
-        stream->read((void*)fontStream->getMemoryBase(), customFontDataLength - 1);
-
-        return CreateTypefaceFromStream(fontStream.get());
-    }
-
-    return SkFontHost::CreateTypeface(NULL, descriptor.getFamilyName(), descriptor.getStyle());
+    desc->setFamilyName(familyName.c_str());
+    *isLocalStream = this->fSerializeAsStream;
 }
 
 static bool getWidthAdvance(HDC hdc, int gId, int16_t* advance) {
     // Initialize the MAT2 structure to the identify transformation matrix.
     static const MAT2 mat2 = {SkScalarToFIXED(1), SkScalarToFIXED(0),
                         SkScalarToFIXED(0), SkScalarToFIXED(1)};
     int flags = GGO_METRICS | GGO_GLYPH_INDEX;
     GLYPHMETRICS gm;
     if (GDI_ERROR == GetGlyphOutline(hdc, gId, flags, &gm, 0, NULL, &mat2)) {
         return false;
@@ skipping 341 matching lines @@
     if (isLCD(*rec) && !isAxisAligned(*rec)) {
         rec->fMaskFormat = SkMask::kA8_Format;
     }
 #endif
 
     if (!fCanBeLCD && isLCD(*rec)) {
         rec->fMaskFormat = SkMask::kA8_Format;
         rec->fFlags &= ~SkScalerContext::kGenA8FromLCD_Flag;
     }
 }