move most of SkFontHost to private (preceeding making it all private)

trunk/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"
@@ skipping 73 matching lines @@
         create(&streamBitmap, streamRect, SkBitmap::kARGB_8888_Config);
         SkCanvas streamCanvas(streamBitmap);
 
         SkPoint point = SkPoint::Make(24, 32);
 
         // 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();
-        const SkFontID typefaceID = SkTypeface::UniqueID(origTypeface);
-        SkStream* fontData = SkFontHost::OpenStream(typefaceID);
+        SkAutoTUnref<SkTypeface> aur;
+        if (NULL == origTypeface) {
+            origTypeface = aur.reset(SkTypeface::RefDefault());

[bungeman-skia, 2013/03/14 03:47:34]

I see that you checked in https://code.google.com/p/skia/source/detail?r=8141 to
make what I suggested in
https://codereview.chromium.org/12739006/diff/1/trunk/src/pdf/SkPDFFont.cpp#n...
shorter (sneaky). However, you're doing this here, why not do it in SkPDFFont
where I suggested it and drop SkTypefacePriv.h?

[reed1, 2013/03/14 14:22:42]

I'm not sure which pattern I like better yet, so I'm trying each. I anticipate
we will need other places to handle null-typefaces as I push more and more
fonthost changes (e.g. adding typeface* to more apis instead of just fontIDs) so
I thought I'd create the priv.h preemptively (which is private after all). When
the dust settles may be the better time to consolidate on a common pattern...

+        }
+
+        int ttcIndex;
+        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)