Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

apps/moterm/moterm_view.cc

 // Copyright 2015 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 "apps/moterm/moterm_view.h"
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
@@ skipping 47 matching lines @@
     // connection context argument.
     service_provider_impl_.Bind(mojo::ConnectionContext(),
                                 service_provider_request.Pass());
     service_provider_impl_.AddService<mojo::terminal::Terminal>([this](
         const mojo::ConnectionContext& connection_context,
         mojo::InterfaceRequest<mojo::terminal::Terminal> terminal_request) {
       terminal_bindings_.AddBinding(this, terminal_request.Pass());
     });
   }
 
-  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 = {};
   fg_paint.getFontMetrics(&fm);
   ascent_ = static_cast<int>(ceilf(-fm.fAscent));
   line_height_ = ascent_ + static_cast<int>(ceilf(fm.fDescent + fm.fLeading));
   DCHECK_GT(line_height_, 0);
   // To figure out the advance width, measure an X. Better hope the font is
   // monospace.
   advance_width_ = static_cast<int>(ceilf(fg_paint.measureText("X", 1)));
@@ skipping 183 matching lines @@
 void MotermView::DrawContent(
     const mojo::skia::GaneshContext::Scope& ganesh_scope,
     const mojo::Size& texture_size,
     SkCanvas* canvas) {
   canvas->clear(SK_ColorBLACK);
 
   SkPaint bg_paint;
   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);
 
   MotermModel::Size size = model_.GetSize();
   int y = 0;
   for (unsigned i = 0; i < size.rows; i++, y += line_height_) {
     int x = 0;
     for (unsigned j = 0; j < size.columns; j++, x += advance_width_) {
       MotermModel::CharacterInfo ch =
           model_.GetCharacterInfoAt(MotermModel::Position(i, j));
@@ skipping 45 matching lines @@
 
 void MotermView::OnKeyPressed(mojo::EventPtr key_event) {
   std::string input_sequence =
       GetInputSequenceForKeyPressedEvent(*key_event, keypad_application_mode_);
   if (input_sequence.empty())
     return;
 
   if (driver_)
     driver_->SendData(input_sequence.data(), input_sequence.size());
 }