Force all font backends to override onGetFontDescriptor, so we can

src/core/SkTypeface.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 "SkAdvancedTypefaceMetrics.h"
+#include "SkFontDescriptor.h"
+#include "SkFontHost.h"
+#include "SkFontStream.h"
+#include "SkStream.h"
 #include "SkTypeface.h"
-#include "SkFontHost.h"
 
 SK_DEFINE_INST_COUNT(SkTypeface)
 
 //#define TRACE_LIFECYCLE
 
 #ifdef TRACE_LIFECYCLE
     static int32_t gTypefaceCounter;
 #endif
 
 SkTypeface::SkTypeface(Style style, SkFontID fontID, bool isFixedWidth)
@@ skipping 58 matching lines @@
 SkTypeface* SkTypeface::CreateFromStream(SkStream* stream) {
     return SkFontHost::CreateTypefaceFromStream(stream);
 }
 
 SkTypeface* SkTypeface::CreateFromFile(const char path[]) {
     return SkFontHost::CreateTypefaceFromFile(path);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void SkTypeface::serialize(SkWStream* stream) const {
-    SkFontHost::Serialize(this, stream);
+void SkTypeface::serialize(SkWStream* wstream) const {
+    bool isLocal = false;
+    SkFontDescriptor desc(this->style());
+    this->onGetFontDescriptor(&desc, &isLocal);
+
+    desc.serialize(wstream);
+    if (isLocal) {
+        int ttcIndex;   // TODO: write this to the stream?

[bungeman-skia, 2013/03/22 21:04:05]

Yes, we need a issue to track this.

[reed1, 2013/03/25 12:26:27]

Done.

+        SkAutoTUnref<SkStream> rstream(this->openStream(&ttcIndex));
+        if (rstream.get()) {
+            size_t length = rstream->getLength();
+            wstream->writePackedUInt(length);
+            wstream->writeStream(rstream, length);
+        } else {
+            wstream->writePackedUInt(0);
+        }
+    } else {
+        wstream->writePackedUInt(0);
+    }
 }
 
 SkTypeface* SkTypeface::Deserialize(SkStream* stream) {
-    return SkFontHost::Deserialize(stream);
-}
+    SkFontDescriptor desc(stream);
+    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 SkTypeface::CreateFromStream(localStream.get());

[bungeman-skia, 2013/03/22 21:04:05]

In the same issue, or maybe here in comment, note that we need to read the
ttcIndex from the stream and pass it to CreateFromStream (as a new optional?
parameter).

[reed1, 2013/03/25 12:26:27]

Done.

+        }
+        // failed to allocate, so just skip and create-from-name
+        stream->skip(length);
+    }
 
-SkAdvancedTypefaceMetrics* SkTypeface::getAdvancedTypefaceMetrics(
-                                SkAdvancedTypefaceMetrics::PerGlyphInfo info,
-                                const uint32_t* glyphIDs,
-                                uint32_t glyphIDsCount) const {
-    return this->onGetAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount);
+    return SkTypeface::CreateFromName(desc.getFamilyName(), desc.getStyle());
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 int SkTypeface::countTables() const {
     return this->onGetTableTags(NULL);
 }
 
 int SkTypeface::getTableTags(SkFontTableTag tags[]) const {
     return this->onGetTableTags(tags);
@@ skipping 15 matching lines @@
         ttcIndex = &ttcIndexStorage;
     }
     return this->onOpenStream(ttcIndex);
 }
 
 int SkTypeface::getUnitsPerEm() const {
     // should we try to cache this in the base-class?
     return this->onGetUPEM();
 }
 
+SkAdvancedTypefaceMetrics* SkTypeface::getAdvancedTypefaceMetrics(
+                                SkAdvancedTypefaceMetrics::PerGlyphInfo info,
+                                const uint32_t* glyphIDs,
+                                uint32_t glyphIDsCount) const {
+    return this->onGetAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "SkFontDescriptor.h"
-
 int SkTypeface::onGetUPEM() const {
     int upem = 0;
 
     SkAdvancedTypefaceMetrics* metrics;
     metrics = this->getAdvancedTypefaceMetrics(
                              SkAdvancedTypefaceMetrics::kNo_PerGlyphInfo,
                              NULL, 0);
     if (metrics) {
         upem = metrics->fEmSize;
         metrics->unref();
     }
     return upem;
 }
 
-void SkTypeface::onGetFontDescriptor(SkFontDescriptor* desc) const {
-    desc->setStyle(this->style());
-}
-
-#include "SkFontStream.h"
-#include "SkStream.h"
-
 int SkTypeface::onGetTableTags(SkFontTableTag tags[]) const {
     int ttcIndex;
     SkAutoTUnref<SkStream> stream(this->openStream(&ttcIndex));
     return stream.get() ? SkFontStream::GetTableTags(stream, ttcIndex, tags) : 0;
 }
 
 size_t SkTypeface::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;
 }
+