SkCanvas::NewRaster is deprecated, create a surface instead

content/browser/compositor/software_output_device_x11.cc

Index: content/browser/compositor/software_output_device_x11.cc
diff --git a/content/browser/compositor/software_output_device_x11.cc b/content/browser/compositor/software_output_device_x11.cc
index ebaefd7550ef05c7c52c0703fa701a90c68f47f7..fb57d9c70da2c6336aeaa8e1a4979d7b10b32c50 100644
--- a/content/browser/compositor/software_output_device_x11.cc
+++ b/content/browser/compositor/software_output_device_x11.cc
@@ -38,10 +38,10 @@ SoftwareOutputDeviceX11::~SoftwareOutputDeviceX11() {
 
 void SoftwareOutputDeviceX11::EndPaint(cc::SoftwareFrameData* frame_data) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(canvas_);
+  DCHECK(surface_);
   DCHECK(frame_data);
 
-  if (!canvas_)
+  if (!surface_)
     return;
 
   SoftwareOutputDevice::EndPaint(frame_data);
@@ -64,7 +64,7 @@ void SoftwareOutputDeviceX11::EndPaint(cc::SoftwareFrameData* frame_data) {
 
     SkImageInfo info;
     size_t rowBytes;
-    const void* addr = canvas_->peekPixels(&info, &rowBytes);
+    const void* addr = surface_->peekPixels(&info, &rowBytes);
     image.width = viewport_pixel_size_.width();
     image.height = viewport_pixel_size_.height();
     image.depth = 32;
@@ -118,7 +118,7 @@ void SoftwareOutputDeviceX11::EndPaint(cc::SoftwareFrameData* frame_data) {
   // TODO(jbauman): Switch to XShmPutImage since it's async.
   SkImageInfo info;
   size_t rowBytes;
-  const void* addr = canvas_->peekPixels(&info, &rowBytes);
+  const void* addr = surface_->peekPixels(&info, &rowBytes);
   gfx::PutARGBImage(display_,
                     attributes_.visual,
                     attributes_.depth,