Revert of Move SkTypeface to sk_sp.

src/core/SkTextBlob.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTextBlobRunIterator.h"
 
 #include "SkReadBuffer.h"
 #include "SkTypeface.h"
 #include "SkWriteBuffer.h"
 
 namespace {
 
 // TODO(fmalita): replace with SkFont.
 class RunFont : SkNoncopyable {
 public:
     RunFont(const SkPaint& paint)
         : fSize(paint.getTextSize())
         , fScaleX(paint.getTextScaleX())
         , fTypeface(SkSafeRef(paint.getTypeface()))
         , fSkewX(paint.getTextSkewX())
         , fAlign(paint.getTextAlign())
         , fHinting(paint.getHinting())
         , fFlags(paint.getFlags() & kFlagsMask) { }
 
     void applyToPaint(SkPaint* paint) const {
         paint->setTextEncoding(SkPaint::kGlyphID_TextEncoding);
-        paint->setTypeface(fTypeface);
+        paint->setTypeface(fTypeface.get());
         paint->setTextSize(fSize);
         paint->setTextScaleX(fScaleX);
         paint->setTextSkewX(fSkewX);
         paint->setTextAlign(static_cast<SkPaint::Align>(fAlign));
         paint->setHinting(static_cast<SkPaint::Hinting>(fHinting));
 
         paint->setFlags((paint->getFlags() & ~kFlagsMask) | fFlags);
     }
 
     bool operator==(const RunFont& other) const {
@@ skipping 25 matching lines @@
         SkPaint::kEmbeddedBitmapText_Flag |
         SkPaint::kAutoHinting_Flag        |
         SkPaint::kVerticalText_Flag       |
         SkPaint::kGenA8FromLCD_Flag;
 
     SkScalar                 fSize;
     SkScalar                 fScaleX;
 
     // Keep this SkAutoTUnref off the first position, to avoid interfering with SkNoncopyable
     // empty baseclass optimization (http://code.google.com/p/skia/issues/detail?id=3694).
-    sk_sp<SkTypeface>        fTypeface;
+    SkAutoTUnref<SkTypeface> fTypeface;
     SkScalar                 fSkewX;
 
     static_assert(SkPaint::kAlignCount < 4, "insufficient_align_bits");
     uint32_t                 fAlign : 2;
     static_assert(SkPaint::kFull_Hinting < 4, "insufficient_hinting_bits");
     uint32_t                 fHinting : 2;
     static_assert((kFlagsMask & 0xffff) == kFlagsMask, "insufficient_flags_bits");
     uint32_t                 fFlags : 16;
 
     typedef SkNoncopyable INHERITED;
@@ skipping 552 matching lines @@
     )
 
     fStorageUsed = 0;
     fStorageSize = 0;
     fRunCount = 0;
     fLastRun = 0;
     fBounds.setEmpty();
 
     return blob;
 }