SkCanvas::NewRaster is deprecated, create a surface instead

cc/output/software_output_device.cc

Index: cc/output/software_output_device.cc
diff --git a/cc/output/software_output_device.cc b/cc/output/software_output_device.cc
index 0c374c9afb4b2d1f8a3f284c2448bdcb2738525c..f7bc61a841179a7b8cdc4b223135c027c02e68a1 100644
--- a/cc/output/software_output_device.cc
+++ b/cc/output/software_output_device.cc
@@ -27,13 +27,13 @@ void SoftwareOutputDevice::Resize(const gfx::Size& viewport_pixel_size,
                                           viewport_pixel_size.height(),
                                           kOpaque_SkAlphaType);
   viewport_pixel_size_ = viewport_pixel_size;
-  canvas_ = skia::AdoptRef(SkCanvas::NewRaster(info));
+  surface_ = skia::AdoptRef(SkSurface::NewRaster(info));
 }
 
 SkCanvas* SoftwareOutputDevice::BeginPaint(const gfx::Rect& damage_rect) {
-  DCHECK(canvas_);
+  DCHECK(surface_);
   damage_rect_ = damage_rect;
-  return canvas_.get();
+  return surface_->getCanvas();
 }
 
 void SoftwareOutputDevice::EndPaint(SoftwareFrameData* frame_data) {
@@ -44,9 +44,10 @@ void SoftwareOutputDevice::EndPaint(SoftwareFrameData* frame_data) {
 }
 
 void SoftwareOutputDevice::CopyToPixels(const gfx::Rect& rect, void* pixels) {
-  DCHECK(canvas_);
+  DCHECK(surface_);
   SkImageInfo info = SkImageInfo::MakeN32Premul(rect.width(), rect.height());
-  canvas_->readPixels(info, pixels, info.minRowBytes(), rect.x(), rect.y());
+  surface_->getCanvas()->readPixels(info, pixels, info.minRowBytes(), rect.x(),
+                                    rect.y());
 }
 
 void SoftwareOutputDevice::Scroll(const gfx::Vector2d& delta,