SkCanvas::NewRaster is deprecated, create a surface instead

cc/output/software_output_device.h

 // Copyright 2012 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.
 
 #ifndef CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
 #define CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "skia/ext/refptr.h"
+#include "third_party/skia/include/core/SkSurface.h"

[bungeman-skia, 2014/12/09 21:39:54]

It looks like SkCanvas was previously just forward declared, should this be as
well?

[reed1, 2014/12/09 21:48:33]

The actual type is needed for the RefPtr<>

 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/geometry/vector2d.h"
 
 class SkBitmap;
 class SkCanvas;
 
 namespace gfx {
 class VSyncProvider;
 }
@@ skipping 46 matching lines @@
   virtual void ReclaimSoftwareFrame(unsigned id);
 
   // VSyncProvider used to update the timer used to schedule draws with the
   // hardware vsync. Return NULL if a provider doesn't exist.
   virtual gfx::VSyncProvider* GetVSyncProvider();
 
  protected:
   gfx::Size viewport_pixel_size_;
   float scale_factor_;
   gfx::Rect damage_rect_;
-  skia::RefPtr<SkCanvas> canvas_;
+  skia::RefPtr<SkSurface> surface_;
   scoped_ptr<gfx::VSyncProvider> vsync_provider_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDevice);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_