Factory methods for heap-allocated SkTypeface objects.

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"
@@ skipping 19 matching lines @@
 #ifdef TRACE_LIFECYCLE
     SkDebugf("SkTypeface: destroy %p fontID %d total %d\n",
              this, fUniqueID, --gTypefaceCounter);
 #endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class SkEmptyTypeface : public SkTypeface {
 public:
+    static SkEmptyTypeface* Create() {
+        return SkNEW(SkEmptyTypeface);
+    }
+protected:
     SkEmptyTypeface() : SkTypeface(SkTypeface::kNormal, 0, true) { }
-protected:
+
     virtual SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE { return NULL; }
     virtual SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE {
         return NULL;
     }
     virtual void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE { }
     virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
                                 SkAdvancedTypefaceMetrics::PerGlyphInfo,
                                 const uint32_t*, uint32_t) const SK_OVERRIDE { return NULL; }
     virtual void onGetFontDescriptor(SkFontDescriptor*, bool*) const SK_OVERRIDE { }
     virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
@@ skipping 26 matching lines @@
 template <uintmax_t N> struct SkTIsPow2 {
     static const bool value = (N & (N - 1)) == 0;
 };
 SK_COMPILE_ASSERT(SkTIsPow2<FONT_STYLE_COUNT>::value, FONT_STYLE_COUNT_not_power_of_2);
 
 void SkTypeface::create_default_typeface(Style style) {
     if (NULL == gDefaultTypefaces[style]) {
         gDefaultTypefaces[style] = SkFontHost::CreateTypeface(NULL, NULL, style);
     }
     if (NULL == gDefaultTypefaces[style]) {
-        gDefaultTypefaces[style] = SkNEW(SkEmptyTypeface);
+        // FIXME: Use a singleton for SkEmptyTypeface.
+        gDefaultTypefaces[style] = SkEmptyTypeface::Create();
     }
 }
 
 SkTypeface* SkTypeface::GetDefaultTypeface(Style style) {
     SkASSERT((size_t)style < FONT_STYLE_COUNT);
 
     // mask off any other bits to avoid a crash in SK_RELEASE
     style = (Style)(style & (FONT_STYLE_COUNT - 1));
 
     SkOnce(&gDefaultTypefaceOnce[style], SkTypeface::create_default_typeface, style);
@@ skipping 171 matching lines @@
                                 uint32_t glyphIDsCount) const {
     return this->onGetAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 bool SkTypeface::onGetKerningPairAdjustments(const uint16_t glyphs[], int count,
                                              int32_t adjustments[]) const {
     return false;
 }