Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

apps/moterm/moterm_view.cc

Index: apps/moterm/moterm_view.cc
diff --git a/apps/moterm/moterm_view.cc b/apps/moterm/moterm_view.cc
index 43cb2fc78cce29fa66620ef33e1f205e60c77a5b..a31b6d7d053dc96197f6d283e2f16d81d9a31245 100644
--- a/apps/moterm/moterm_view.cc
+++ b/apps/moterm/moterm_view.cc
@@ -65,13 +65,13 @@ MotermView::MotermView(
     });
   }
 
-  regular_typeface_ = skia::AdoptRef(SkTypeface::CreateFromStream(
+  regular_typeface_ = SkTypeface::MakeFromStream(
       new SkMemoryStream(font_data::kDejaVuSansMonoRegular.data,
-                         font_data::kDejaVuSansMonoRegular.size)));
+                         font_data::kDejaVuSansMonoRegular.size));
 
   // TODO(vtl): This duplicates some code.
   SkPaint fg_paint;
-  fg_paint.setTypeface(regular_typeface_.get());
+  fg_paint.setTypeface(regular_typeface_);
   fg_paint.setTextSize(16);
   // Figure out appropriate metrics.
   SkPaint::FontMetrics fm = {};
@@ -275,7 +275,7 @@ void MotermView::DrawContent(
   bg_paint.setStyle(SkPaint::kFill_Style);
 
   SkPaint fg_paint;
-  fg_paint.setTypeface(regular_typeface_.get());
+  fg_paint.setTypeface(regular_typeface_);
   fg_paint.setTextSize(16);
   fg_paint.setTextEncoding(SkPaint::kUTF32_TextEncoding);