Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

examples/ui/jank/jank.cc

Index: examples/ui/jank/jank.cc
diff --git a/examples/ui/jank/jank.cc b/examples/ui/jank/jank.cc
index ae1a8c354dd7aba2551d5eff2c20851aeb853358..782525127658d2be2c8df88e523dcb5f6c416dd5 100644
--- a/examples/ui/jank/jank.cc
+++ b/examples/ui/jank/jank.cc
@@ -59,9 +59,9 @@ class JankView : public mojo::ui::GaneshView,
       : GaneshView(app_connector.Pass(), view_owner_request.Pass(), "Jank"),
         choreographer_(scene(), this),
         input_handler_(GetViewServiceProvider(), this),
-        typeface_(skia::AdoptRef(SkTypeface::CreateFromStream(
+        typeface_(SkTypeface::MakeFromStream(
             new SkMemoryStream(font_data::kDejaVuSansMonoRegular.data,
-                               font_data::kDejaVuSansMonoRegular.size)))) {}
+                               font_data::kDejaVuSansMonoRegular.size))) {}
 
   ~JankView() override {}
 
@@ -163,7 +163,7 @@ class JankView : public mojo::ui::GaneshView,
     textPaint.setColor(SK_ColorBLACK);
     textPaint.setTextSize(16);
     textPaint.setTextEncoding(SkPaint::kUTF8_TextEncoding);
-    textPaint.setTypeface(typeface_.get());
+    textPaint.setTypeface(typeface_);
     textPaint.setAntiAlias(true);
     SkRect textBounds;
     textPaint.measureText(label, strlen(label), &textBounds);
@@ -195,7 +195,7 @@ class JankView : public mojo::ui::GaneshView,
 
   mojo::ui::Choreographer choreographer_;
   mojo::ui::InputHandler input_handler_;
-  skia::RefPtr<SkTypeface> typeface_;
+  sk_sp<SkTypeface> typeface_;
   int64_t stutter_end_time_ = 0u;
 
   DISALLOW_COPY_AND_ASSIGN(JankView);