Update new Surface callsites

cc/raster/tile_task_worker_pool.cc

 // Copyright 2013 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 "cc/raster/tile_task_worker_pool.h"
 
 #include <stddef.h>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/playback/raster_source.h"
 #include "cc/raster/texture_compressor.h"
-#include "skia/ext/refptr.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
 
 namespace cc {
 
 TileTaskWorkerPool::TileTaskWorkerPool() {}
 
 TileTaskWorkerPool::~TileTaskWorkerPool() {}
 
 // static
@@ skipping 62 matching lines @@
     surface_props = SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType);
   }
 
   if (!stride)
     stride = info.minRowBytes();
   DCHECK_GT(stride, 0u);
 
   switch (format) {
     case RGBA_8888:
     case BGRA_8888: {
-      skia::RefPtr<SkSurface> surface = skia::AdoptRef(
-          SkSurface::NewRasterDirect(info, memory, stride, &surface_props));
+      sk_sp<SkSurface> surface =
+          SkSurface::MakeRasterDirect(info, memory, stride, &surface_props);
       raster_source->PlaybackToCanvas(surface->getCanvas(), canvas_bitmap_rect,
                                       canvas_playback_rect, scale,
                                       playback_settings);
       return;
     }
     case RGBA_4444:
     case ETC1: {
-      skia::RefPtr<SkSurface> surface =
-          skia::AdoptRef(SkSurface::NewRaster(info, &surface_props));
+      sk_sp<SkSurface> surface = SkSurface::MakeRaster(info, &surface_props);
       // TODO(reveman): Improve partial raster support by reducing the size of
       // playback rect passed to PlaybackToCanvas. crbug.com/519070
       raster_source->PlaybackToCanvas(surface->getCanvas(), canvas_bitmap_rect,
                                       canvas_bitmap_rect, scale,
                                       playback_settings);
 
       if (format == ETC1) {
         TRACE_EVENT0("cc",
                      "TileTaskWorkerPool::PlaybackToMemory::CompressETC1");
         DCHECK_EQ(size.width() % 4, 0);
         DCHECK_EQ(size.height() % 4, 0);
         scoped_ptr<TextureCompressor> texture_compressor =
             TextureCompressor::Create(TextureCompressor::kFormatETC1);
         texture_compressor->Compress(reinterpret_cast<const uint8_t*>(
                                          surface->peekPixels(nullptr, nullptr)),
                                      reinterpret_cast<uint8_t*>(memory),
                                      size.width(), size.height(),
                                      TextureCompressor::kQualityHigh);
       } else {
         TRACE_EVENT0("cc",
                      "TileTaskWorkerPool::PlaybackToMemory::ConvertRGBA4444");
         SkImageInfo dst_info = SkImageInfo::Make(
             info.width(), info.height(), ResourceFormatToSkColorType(format),
             info.alphaType(), info.profileType());
-        bool rv =
-            surface->getCanvas()->readPixels(dst_info, memory, stride, 0, 0);
+        bool rv = surface->readPixels(dst_info, memory, stride, 0, 0);
         DCHECK(rv);
       }
       return;
     }
     case ALPHA_8:
     case LUMINANCE_8:
     case RGB_565:
     case RED_8:
     case LUMINANCE_F16:
       NOTREACHED();
       return;
   }
 
   NOTREACHED();
 }
 
 }  // namespace cc