Revert of Move SkTypeface to sk_sp.

include/core/SkPaint.h

 /*
  * 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.
  */
 
 #ifndef SkPaint_DEFINED
 #define SkPaint_DEFINED
 
@@ skipping 596 matching lines @@
     /** Set or clear the typeface object.
         <p />
         Pass NULL to clear any previous typeface.
         As a convenience, the parameter passed is also returned.
         If a previous typeface exists, its reference count is decremented.
         If typeface is not NULL, its reference count is incremented.
         @param typeface May be NULL. The new typeface to be installed in the
                         paint
         @return         typeface
     */
+    SkTypeface* setTypeface(SkTypeface* typeface);
     void setTypeface(sk_sp<SkTypeface>);
-#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR
-    SkTypeface* setTypeface(SkTypeface* typeface);
-#endif
 
     /** Get the paint's rasterizer (or NULL).
         <p />
         The raster controls how paths/text are turned into alpha masks.
         @return the paint's rasterizer (or NULL)
     */
     SkRasterizer* getRasterizer() const { return fRasterizer.get(); }
 
     /** Set or clear the rasterizer object.
         <p />
@@ skipping 539 matching lines @@
     friend class GrStencilAndCoverTextContext;
     friend class GrPathRendering;
     friend class GrTextUtils;
     friend class GrGLPathRendering;
     friend class SkScalerContext;
     friend class SkTextBaseIter;
     friend class SkCanonicalizePaint;
 };
 
 #endif