ozone: dri: Composite to intermediate surface & copy

ui/gfx/ozone/impl/file_surface_factory.cc

 // Copyright 2013 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.
 
 #include "ui/gfx/ozone/impl/file_surface_factory.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/stl_util.h"
@@ skipping 17 matching lines @@
                   reinterpret_cast<const char*>(vector_as_array(&png_data)),
                   png_data.size());
 }
 
 class FileSurface : public SurfaceOzoneCanvas {
  public:
   FileSurface(const base::FilePath& location) : location_(location) {}
   virtual ~FileSurface() {}
 
   // SurfaceOzoneCanvas overrides:
-  virtual bool ResizeCanvas(const Size& viewport_size) OVERRIDE {
+  virtual void ResizeCanvas(const Size& viewport_size) OVERRIDE {
     surface_ = skia::AdoptRef(SkSurface::NewRaster(
         SkImageInfo::MakeN32Premul(viewport_size.width(),
                                    viewport_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 {
     SkBitmap bitmap;
     bitmap.setConfig(surface_->getCanvas()->imageInfo());
 
     // TODO(dnicoara) Use SkImage instead to potentially avoid a copy.
     // See crbug.com/361605 for details.
     if (surface_->getCanvas()->readPixels(&bitmap, 0, 0)) {
       base::WorkerPool::PostTask(
           FROM_HERE, base::Bind(&WriteDataToFile, location_, bitmap), true);
     }
-    return true;
   }
   virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE {
     return scoped_ptr<gfx::VSyncProvider>();
   }
 
  private:
   base::FilePath location_;
   skia::RefPtr<SkSurface> surface_;
 };
 
@@ skipping 26 matching lines @@
   return make_scoped_ptr<SurfaceOzoneCanvas>(new FileSurface(location_));
 }
 
 bool FileSurfaceFactory::LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
   return false;
 }
 
 }  // namespace gfx