SkCanvas::NewRaster is deprecated, create a surface instead

cc/output/software_output_device.h

Index: cc/output/software_output_device.h
diff --git a/cc/output/software_output_device.h b/cc/output/software_output_device.h
index d183fdcb43494e3ccbc94d67fd0ef0927b616046..89ab00524c5d65fe809c307387c7b402eb99ab30 100644
--- a/cc/output/software_output_device.h
+++ b/cc/output/software_output_device.h
@@ -9,6 +9,7 @@
 #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"
@@ -75,7 +76,7 @@ class CC_EXPORT SoftwareOutputDevice {
   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: