Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

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 "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 {
 
 class SoftwareFrameData;
 
 // This is a "tear-off" class providing software drawing support to
 // OutputSurface, such as to a platform-provided window framebuffer.
 class CC_EXPORT SoftwareOutputDevice {
  public:
@@ skipping 12 matching lines @@
 
   virtual void DiscardBackbuffer() {}
   virtual void EnsureBackbuffer() {}
 
   // TODO(skaslev) Remove this after UberCompositor lands.
   virtual void ReclaimSoftwareFrame(unsigned id);
 
  protected:
   gfx::Size viewport_size_;
   gfx::Rect damage_rect_;
-  skia::RefPtr<SkDevice> device_;
+  skia::RefPtr<SkBaseDevice> device_;
   skia::RefPtr<SkCanvas> canvas_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SoftwareOutputDevice);
 };
 
 }  // namespace cc
 
 #endif  // CC_OUTPUT_SOFTWARE_OUTPUT_DEVICE_H_