Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

examples/ui/jank/jank.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <unistd.h>
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
@@ skipping 41 matching lines @@
 
 class JankView : public mojo::ui::GaneshView,
                  public mojo::ui::ChoreographerDelegate,
                  public mojo::ui::InputListener {
  public:
   JankView(mojo::InterfaceHandle<mojo::ApplicationConnector> app_connector,
            mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request)
       : 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 {}
 
  private:
   // |GaneshView|:
   void OnPropertiesChanged(
       uint32_t old_scene_version,
       mojo::ui::ViewPropertiesPtr old_properties) override {
     choreographer_.ScheduleDraw();
   }
@@ skipping 81 matching lines @@
     boxPaint.setColor(SkColorSetRGB(200, 200, 200));
     canvas->drawRect(bounds, boxPaint);
     boxPaint.setColor(SkColorSetRGB(40, 40, 40));
     boxPaint.setStyle(SkPaint::kStroke_Style);
     canvas->drawRect(bounds, boxPaint);
 
     SkPaint textPaint;
     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);
     canvas->drawText(label, strlen(label),
                      bounds.centerX() - textBounds.centerX(),
                      bounds.centerY() - textBounds.centerY(), textPaint);
   }
 
   void OnClick(const Button& button) {
     LOG(INFO) << "Clicked: " << button.label;
@@ skipping 11 matching lines @@
 
       case Action::kCrash: {
         abort();
         break;
       }
     }
   }
 
   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);
 };
 
 class JankApp : public mojo::ui::ViewProviderApp {
  public:
   JankApp() {}
   ~JankApp() override {}
 
   void CreateView(
       const std::string& connection_url,
       mojo::InterfaceRequest<mojo::ui::ViewOwner> view_owner_request,
       mojo::InterfaceRequest<mojo::ServiceProvider> services) override {
     new JankView(mojo::CreateApplicationConnector(app_impl()->shell()),
                  view_owner_request.Pass());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(JankApp);
 };
 
 }  // namespace examples
 
 MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new examples::JankApp());
   return runner.Run(application_request);
 }