Address some more valgrind issues

tests/FontHostStreamTest.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkTypes.h"
 
 #include "Test.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "SkColor.h"
 #include "SkFontHost.h"
 #include "SkGraphics.h"
 #include "SkPaint.h"
 #include "SkPoint.h"
 #include "SkRect.h"
+#include "SkStream.h"
 #include "SkTypeface.h"
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static const SkColor bgColor = SK_ColorWHITE;
 
 static void create(SkBitmap* bm, SkIRect bound, SkBitmap::Config config) {
     bm->setConfig(config, bound.width(), bound.height());
     bm->allocPixels();
 }
@@ skipping 63 matching lines @@
         // Test: origTypeface and streamTypeface from orig data draw the same
         drawBG(&origCanvas);
         origCanvas.drawText("A", 1, point.fX, point.fY, paint);
 
         SkTypeface* origTypeface = paint.getTypeface();
         SkAutoTUnref<SkTypeface> aur;
         if (NULL == origTypeface) {
             origTypeface = aur.reset(SkTypeface::RefDefault());
         }
 
         int ttcIndex;

[robertphillips, 2013/11/14 14:21:41]

This addresses:

80 (32 direct, 48 indirect) bytes in 1 blocks are definitely lost in loss record
174 of 357
at 0x4C2B1C7: operator new(unsigned long) (in
/usr/lib/valgrind/vgpreload_memcheck-amd64-linux.so)
by 0x5743EB: SkStream::NewFromFile(char const*) (SkStream.cpp:835)
by 0x65FF86:
SkFontConfigInterfaceDirect::openStream(SkFontConfigInterface::FontIdentity
const&) (SkFontConfigInterface_direct.cpp:555)
by 0x65FD30: FontConfigTypeface::onOpenStream(int*) const
(SkFontHost_fontconfig.cpp:202)
by 0x576EEF: SkTypeface::openStream(int*) const (SkTypeface.cpp:209)
by 0x43AC43: test_fontHostStream(skiatest::Reporter*)
(FontHostStreamTest.cpp:102)
by 0x43AFE1: skiatest::FontHostStreamTestClass::onRun(skiatest::Reporter*)
(FontHostStreamTest.cpp:116)
by 0x49670A: skiatest::Test::run() (Test.cpp:109)
by 0x48FDA0: SkTestRunnable::run() (skia_test.cpp:155)
by 0x64BB65: SkThreadPool::Loop(void*) (SkThreadPool.cpp:97)
by 0x65697A: thread_start(void*) (SkThreadUtils_pthread.cpp:66)
by 0x4E39E99: start_thread (pthread_create.c:308)
by 0x6C71CCC: clone (clone.S:112)

-        SkStream* fontData = origTypeface->openStream(&ttcIndex);
+        SkAutoTUnref<SkStream> fontData(origTypeface->openStream(&ttcIndex));
         SkTypeface* streamTypeface = SkTypeface::CreateFromStream(fontData);
         SkSafeUnref(paint.setTypeface(streamTypeface));
         drawBG(&streamCanvas);
         streamCanvas.drawPosText("A", 1, &point, paint);
 
         REPORTER_ASSERT(reporter,
                         compare(origBitmap, origRect, streamBitmap, streamRect));
     }
     //Make sure the typeface is deleted and removed.
     SkGraphics::PurgeFontCache();
 }
 
 #include "TestClassDef.h"
 DEFINE_TESTCLASS("FontHost::CreateTypefaceFromStream", FontHostStreamTestClass, test_fontHostStream)