Force all font backends to override onGetFontDescriptor, so we can

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"
@@ skipping 71 matching lines @@
     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;
+    virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE;
     virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE;
 
 private:
     typedef SkTypeface_FreeType INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 struct FindRec {
     FindRec(const char* name, SkTypeface::Style style)
@@ skipping 73 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 // DEPRECATED
 SkTypeface* SkFontHost::NextLogicalTypeface(SkFontID curr, SkFontID orig) {
     // We don't handle font fallback.
     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;
-
-    SkFontDescriptor desc;
-    fct->onGetFontDescriptor(&desc);
-    desc.serialize(stream);
-
-    // by convention, we also write out the actual sfnt data, preceeded by
-    // a packed-length. For now we skip that, so we just write the zero.
-    stream->writePackedUInt(0);
-}
-
-SkTypeface* SkFontHost::Deserialize(SkStream* stream) {
-    SkFontDescriptor descriptor(stream);
-    const char* familyName = descriptor.getFamilyName();
-    const SkTypeface::Style style = descriptor.getStyle();
-
-    size_t length = stream->readPackedUInt();
-    if (length > 0) {
-        void* addr = sk_malloc_flags(length, 0);
-        if (addr) {
-            SkAutoTUnref<SkStream> localStream(SkNEW_ARGS(SkMemoryStream,
-                                                        (addr, length, false)));
-            return SkFontHost::CreateTypefaceFromStream(localStream.get());
-        }
-        // failed to allocate, so just skip and create-from-name
-        stream->skip(length);
-    }
-
-    return SkFontHost::CreateTypeface(NULL, familyName, style);
-}
-
-///////////////////////////////////////////////////////////////////////////////
-
 SkStream* FontConfigTypeface::onOpenStream(int* ttcIndex) const {
     SkStream* stream = this->getLocalStream();
     if (stream) {
         // TODO: fix issue 1176.
         // As of now open_stream will return a stream and unwind it, but the
         // SkStream is not thread safe, and if two threads use the stream they
         // may collide and print preview for example could still fail,
         // or there could be some failures in rendering if this stream is used
         // there.
         stream->rewind();
@@ skipping 22 matching lines @@
 size_t FontConfigTypeface::onGetTableData(SkFontTableTag tag, size_t offset,
                                   size_t length, void* data) const {
     int ttcIndex;
     SkAutoTUnref<SkStream> stream(this->openStream(&ttcIndex));
     return stream.get()
                 ? SkFontStream::GetTableData(stream, ttcIndex,
                                              tag, offset, length, data)
                 : 0;
 }
 
-void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc) const {
-    desc->setStyle(this->style());
+void FontConfigTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
+                                             bool* isLocalStream) const {
     desc->setFamilyName(this->getFamilyName());
+    *isLocalStream = SkToBool(this->getLocalStream());
 }
+