Make SkStream *not* ref counted.

src/core/SkFontMgr.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFontMgr.h"
 #include "SkLazyPtr.h"
+#include "SkStream.h"
 #include "SkTypes.h"
 
 class SkFontStyle;
 class SkStream;

[bungeman-skia, 2015/01/20 22:23:54]

Since we need to include now, should remove this forward decl.

[scroggo, 2015/01/20 22:25:15]

Done.

 class SkTypeface;
 
 class SkEmptyFontStyleSet : public SkFontStyleSet {
 public:
     int count() SK_OVERRIDE { return 0; }
     void getStyle(int, SkFontStyle*, SkString*) SK_OVERRIDE {
         SkDEBUGFAIL("SkFontStyleSet::getStyle called on empty set");
     }
     SkTypeface* createTypeface(int index) SK_OVERRIDE {
         SkDEBUGFAIL("SkFontStyleSet::createTypeface called on empty set");
@@ skipping 37 matching lines @@
                                                     SkUnichar character) const SK_OVERRIDE {
         return NULL;
     }
     virtual SkTypeface* onMatchFaceStyle(const SkTypeface*,
                                          const SkFontStyle&) const SK_OVERRIDE {
         return NULL;
     }
     SkTypeface* onCreateFromData(SkData*, int) const SK_OVERRIDE {
         return NULL;
     }
-    SkTypeface* onCreateFromStream(SkStream*, int) const SK_OVERRIDE {
+    SkTypeface* onCreateFromStream(SkStream* stream, int) const SK_OVERRIDE {
+        SkDELETE(stream);
         return NULL;
     }
     SkTypeface* onCreateFromFile(const char[], int) const SK_OVERRIDE {
         return NULL;
     }
     SkTypeface* onLegacyCreateTypeface(const char [], unsigned) const SK_OVERRIDE {
         return NULL;
     }
 };
 
@@ skipping 66 matching lines @@
 SkFontMgr* sk_fontmgr_create_default() {
     SkFontMgr* fm = SkFontMgr::Factory();
     return fm ? fm : SkNEW(SkEmptyFontMgr);
 }
 
 SK_DECLARE_STATIC_LAZY_PTR(SkFontMgr, singleton, sk_fontmgr_create_default);
 
 SkFontMgr* SkFontMgr::RefDefault() {
     return SkRef(singleton.get());
 }