Make SkStream *not* ref counted.

src/ports/SkFontHost_FreeType.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 "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 215 matching lines @@
     void updateGlyphIfLCD(SkGlyph* glyph);
     // Caller must lock gFTMutex before calling this function.
     // update FreeType2 glyph slot with glyph emboldened
     void emboldenIfNeeded(FT_Face face, FT_GlyphSlot glyph);
 };
 
 ///////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////
 
 struct SkFaceRec {
-    SkFaceRec*      fNext;
-    FT_Face         fFace;
-    FT_StreamRec    fFTStream;
-    SkStream*       fSkStream;
-    uint32_t        fRefCnt;
-    uint32_t        fFontID;
+    SkFaceRec*              fNext;
+    FT_Face                 fFace;
+    FT_StreamRec            fFTStream;
+    SkAutoTDelete<SkStream> fSkStream;
+    uint32_t                fRefCnt;
+    uint32_t                fFontID;
 
     // assumes ownership of the stream, will call unref() when its done

[bungeman-skia, 2015/01/15 22:44:55]

Comment, 'will delete when its done'.

[scroggo, 2015/01/16 19:13:37]

Done.

     SkFaceRec(SkStream* strm, uint32_t fontID);
-    ~SkFaceRec() {
-        fSkStream->unref();
-    }
 };
 
 extern "C" {
     static unsigned long sk_ft_stream_io(FT_Stream stream,
                                          unsigned long offset,
                                          unsigned char* buffer,
                                          unsigned long count)
     {
         SkStream* str = (SkStream*)stream->descriptor.pointer;
 
@@ skipping 1459 matching lines @@
     if (style) {
         *style = SkFontStyle(weight, width, slant);
     }
     if (isFixedPitch) {
         *isFixedPitch = FT_IS_FIXED_WIDTH(face);
     }
 
     FT_Done_Face(face);
     return true;
 }