Changed SoftwareOutputDevice interface.

cc/software_output_device.h

Index: cc/software_output_device.h
diff --git a/cc/software_output_device.h b/cc/software_output_device.h
index 0581b2b5b8ae3294c362abeb9755214cb4dcd8ad..77ba6f71aa6df783fbd90b23cc7905f25928ab46 100644
--- a/cc/software_output_device.h
+++ b/cc/software_output_device.h
@@ -5,25 +5,47 @@
 #ifndef CC_SOFTWARE_OUTPUT_DEVICE_H_
 #define CC_SOFTWARE_OUTPUT_DEVICE_H_
 
-#include "third_party/WebKit/Source/Platform/chromium/public/WebImage.h"
+#include "cc/cc_export.h"
+#include "skia/ext/refptr.h"
+#include "ui/gfx/rect.h"
 #include "ui/gfx/size.h"
+#include "ui/gfx/vector2d.h"
+#include "ui/surface/transport_dib.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 SoftwareOutputDevice {
+class CC_EXPORT SoftwareOutputDevice {
  public:
-  virtual ~SoftwareOutputDevice() {}
 
-  // Lock the framebuffer and return a pointer to a WebImage referring to its
-  // pixels. Set forWrite if you intend to change the pixels. Readback
-  // is supported whether or not forWrite is set.
-  // TODO(danakj): Switch this from WebImage to a Skia type.
-  virtual WebKit::WebImage* Lock(bool forWrite) = 0;
-  virtual void Unlock() = 0;
+  SoftwareOutputDevice();
+  virtual ~SoftwareOutputDevice();
+
+  // SoftwareOutputDevice implementation
+  virtual void Resize(const gfx::Size& size);
+
+  virtual SkCanvas* BeginPaint(const gfx::Rect& damage_rect);
+  virtual void EndPaint(SoftwareFrameData* frame_data=NULL);
+
+  virtual void CopyToBitmap(const gfx::Rect& rect, SkBitmap* output);
+  virtual void Scroll(const gfx::Vector2d& delta,
+                      const gfx::Rect& clip_rect);
+
+  // TODO(skaslev) Remove this after UberCompositor lands.
+  virtual void ReclaimDIB(TransportDIB::Handle handle);
 
-  virtual void DidChangeViewportSize(gfx::Size) = 0;
+protected:
+  gfx::Size viewport_size_;
+  gfx::Rect damage_rect_;
+  skia::RefPtr<SkDevice> device_;
+  skia::RefPtr<SkCanvas> canvas_;
 };
 
 }  // namespace cc