SkCanvas::NewRaster is deprecated, create a surface instead

content/renderer/gpu/compositor_software_output_device.cc

 // Copyright (c) 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 "content/renderer/gpu/compositor_software_output_device.h"
 
 #include "base/logging.h"
 #include "cc/output/software_frame_data.h"
 #include "content/child/child_shared_bitmap_manager.h"
 #include "content/renderer/render_process.h"
@@ skipping 134 matching lines @@
   if (current_index_ != kInvalidIndex)
     previous = buffers_[current_index_];
   current_index_ = FindFreeBuffer(current_index_ + 1);
   Buffer* current = buffers_[current_index_];
   DCHECK(current->free());
   current->SetFree(false);
 
   // Set up a canvas for the current front buffer.
   SkImageInfo info = SkImageInfo::MakeN32Premul(viewport_pixel_size_.width(),
                                                 viewport_pixel_size_.height());
-  SkBitmap bitmap;
-  bitmap.installPixels(info, current->memory(), info.minRowBytes());
-  canvas_ = skia::AdoptRef(new SkCanvas(bitmap));
+  surface_ = skia::AdoptRef(SkSurface::NewRasterDirect(info, current->memory(),
+                                                       info.minRowBytes()));
 
   if (!previous) {
     DCHECK(damage_rect == gfx::Rect(viewport_pixel_size_));
   } else {
     // Find the smallest damage region that needs
     // to be copied from the |previous| buffer.
     SkRegion region;
     bool found =
         current->FindDamageDifferenceFrom(previous, &region) ||
         previous->FindDamageDifferenceFrom(current, &region);
     if (!found)
       region = SkRegion(RectToSkIRect(gfx::Rect(viewport_pixel_size_)));
     region.op(RectToSkIRect(damage_rect), SkRegion::kDifference_Op);
 
     // Copy over the damage region.
     if (!region.isEmpty()) {
       SkImageInfo info = SkImageInfo::MakeN32Premul(
           viewport_pixel_size_.width(), viewport_pixel_size_.height());
       SkBitmap back_bitmap;
       back_bitmap.installPixels(info, previous->memory(), info.minRowBytes());
 
       for (SkRegion::Iterator it(region); !it.done(); it.next()) {
         const SkIRect& src_rect = it.rect();
         SkRect dst_rect = SkRect::Make(src_rect);
-        canvas_->drawBitmapRect(back_bitmap, &src_rect, dst_rect, NULL);
+        surface_->getCanvas()->drawBitmapRect(back_bitmap, &src_rect, dst_rect);
       }
     }
   }
 
   // Make |current| child of |previous| and orphan all of |current|'s children.
   current->SetParent(previous, damage_rect);
   for (size_t i = 0; i < buffers_.size(); ++i) {
     Buffer* buffer = buffers_[i];
     if (buffer->parent() == current)
       buffer->SetParent(NULL, gfx::Rect(viewport_pixel_size_));
   }
   damage_rect_ = damage_rect;
 
-  return canvas_.get();
+  return surface_->getCanvas();
 }
 
 void CompositorSoftwareOutputDevice::EndPaint(
     cc::SoftwareFrameData* frame_data) {
   DCHECK(CalledOnValidThread());
   DCHECK(frame_data);
 
   Buffer* buffer = buffers_[current_index_];
   frame_data->id = buffer->id();
   frame_data->size = viewport_pixel_size_;
@@ skipping 17 matching lines @@
     return;
   } else {
     it = std::find_if(awaiting_ack_.begin(), awaiting_ack_.end(),
                       CompareById(id));
     DCHECK(it != awaiting_ack_.end());
     awaiting_ack_.erase(it);
   }
 }
 
 }  // namespace content