SkCanvas::NewRaster is deprecated, create a surface instead

content/browser/compositor/software_output_device_x11.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 "content/browser/compositor/software_output_device_x11.h"
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 
 #include "content/public/browser/browser_thread.h"
@@ skipping 20 matching lines @@
 }
 
 SoftwareOutputDeviceX11::~SoftwareOutputDeviceX11() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   XFreeGC(display_, gc_);
 }
 
 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);
 
   gfx::Rect rect = damage_rect_;
   rect.Intersect(gfx::Rect(viewport_pixel_size_));
   if (rect.IsEmpty())
     return;
 
   int bpp = gfx::BitsPerPixelForPixmapDepth(display_, attributes_.depth);
 
   if (bpp != 32 && bpp != 16 && ui::QueryRenderSupport(display_)) {
     // gfx::PutARGBImage only supports 16 and 32 bpp, but Xrender can do other
     // conversions.
     Pixmap pixmap = XCreatePixmap(
         display_, compositor_->widget(), rect.width(), rect.height(), 32);
     GC gc = XCreateGC(display_, pixmap, 0, NULL);
     XImage image;
     memset(&image, 0, sizeof(image));
 
     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;
     image.bits_per_pixel = 32;
     image.format = ZPixmap;
     image.byte_order = LSBFirst;
     image.bitmap_unit = 8;
     image.bitmap_bit_order = LSBFirst;
     image.bytes_per_line = rowBytes;
     image.red_mask = 0xff;
@@ skipping 33 matching lines @@
                      rect.height());  // height
     XRenderFreePicture(display_, picture);
     XRenderFreePicture(display_, dest_picture);
     XFreePixmap(display_, pixmap);
     return;
   }
 
   // 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,
                     compositor_->widget(),
                     gc_,
                     static_cast<const uint8*>(addr),
                     viewport_pixel_size_.width(),
                     viewport_pixel_size_.height(),
                     rect.x(),
                     rect.y(),
                     rect.x(),
                     rect.y(),
                     rect.width(),
                     rect.height());
 }
 
 }  // namespace content