Roll skia to 8cc209111876b7c78b5ec577c9221d8ed5e21024

ui/ozone/demo/software_renderer.cc

 // Copyright 2014 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 "ui/ozone/demo/software_renderer.h"
 
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/ozone/public/ozone_platform.h"
@@ skipping 28 matching lines @@
 
   software_surface_->ResizeCanvas(size_);
   vsync_provider_ = software_surface_->CreateVSyncProvider();
   RenderFrame();
   return true;
 }
 
 void SoftwareRenderer::RenderFrame() {
   float fraction = NextFraction();
 
-  skia::RefPtr<SkSurface> surface = software_surface_->GetSurface();
+  sk_sp<SkSurface> surface = software_surface_->GetSurface();
 
   SkColor color =
       SkColorSetARGB(0xff, 0, 0xff * fraction, 0xff * (1 - fraction));
 
   surface->getCanvas()->clear(color);
 
   software_surface_->PresentCanvas(gfx::Rect(size_));
 
   if (vsync_provider_) {
     vsync_provider_->GetVSyncParameters(
         base::Bind(&SoftwareRenderer::UpdateVSyncParameters,
                    weak_ptr_factory_.GetWeakPtr()));
   }
 
   timer_.Start(FROM_HERE, vsync_period_, this, &SoftwareRenderer::RenderFrame);
 }
 
 void SoftwareRenderer::UpdateVSyncParameters(const base::TimeTicks timebase,
                                              const base::TimeDelta interval) {
   vsync_period_ = interval;
 }
 
 }  // namespace ui