Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

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 c1a97dcbf25fbfac79243c4df402e584f7f6b074..788673ede9520d077ea277d571b0bc8c0c6a9ea6 100644
--- a/cc/output/software_output_device.h
+++ b/cc/output/software_output_device.h
@@ -8,12 +8,13 @@
 #include "base/basictypes.h"
 #include "cc/base/cc_export.h"
 #include "skia/ext/refptr.h"
+// TODO(robertphillips): change this to "class SkBaseDevice;"

[danakj, 2013/08/22 19:48:30]

How come this isn't possible right now?

[robertphillips, 2013/08/22 19:55:53]

I'm trying to minimize the amount of work that needs to be done when the Skia
patch lands (and DEPS rolls). Right now we would need add:

class SkDevice;
typedef SkDevice SkBaseDevice;

here to make the compiler happy. When doing the DEPS roll that includes the Skia
change I would also have to immediately convert them to 

class SkBaseDevice;

By temporarily including the header I can postpone those changes to another
patch after the big switch.

[danakj, 2013/08/22 19:56:44]

I see, thanks. sg.

+#include "third_party/skia/include/core/SkDevice.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/vector2d.h"
 
 class SkBitmap;
-class SkDevice;
 class SkCanvas;
 
 namespace cc {
@@ -46,7 +47,7 @@ class CC_EXPORT SoftwareOutputDevice {
  protected:
   gfx::Size viewport_size_;
   gfx::Rect damage_rect_;
-  skia::RefPtr<SkDevice> device_;
+  skia::RefPtr<SkBaseDevice> device_;
   skia::RefPtr<SkCanvas> canvas_;
 
  private: