ozone: dri: Composite to intermediate surface & copy

content/browser/compositor/software_output_device_ozone_unittest.cc

Index: content/browser/compositor/software_output_device_ozone_unittest.cc
diff --git a/content/browser/compositor/software_output_device_ozone_unittest.cc b/content/browser/compositor/software_output_device_ozone_unittest.cc
index 552430e8b183fc1d47bcb11c49fae487e8e0d071..e208052ee27b9f546a44c830cbe201ef9b590290 100644
--- a/content/browser/compositor/software_output_device_ozone_unittest.cc
+++ b/content/browser/compositor/software_output_device_ozone_unittest.cc
@@ -25,17 +25,15 @@ class MockSurfaceOzone : public gfx::SurfaceOzoneCanvas {
   virtual ~MockSurfaceOzone() {}
 
   // gfx::SurfaceOzoneCanvas overrides:
-  virtual bool ResizeCanvas(const gfx::Size& size) OVERRIDE {
+  virtual void ResizeCanvas(const gfx::Size& size) OVERRIDE {
     surface_ = skia::AdoptRef(SkSurface::NewRaster(
         SkImageInfo::MakeN32Premul(size.width(), size.height())));
-    return true;
   }
   virtual skia::RefPtr<SkCanvas> GetCanvas() OVERRIDE {
     return skia::SharePtr(surface_->getCanvas());
   }
-  virtual bool PresentCanvas() OVERRIDE {
+  virtual void PresentCanvas(const gfx::Rect& damage) OVERRIDE {
     NOTIMPLEMENTED();
-    return true;
   }
   virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE {
     return scoped_ptr<gfx::VSyncProvider>();