ozone: dri: Composite to intermediate surface & copy

ui/ozone/platform/caca/caca_surface_factory.cc

 // Copyright 2014 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/ozone/platform/caca/caca_surface_factory.h"
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/ozone/surface_ozone_canvas.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/ozone/platform/caca/caca_connection.h"
 
 namespace ui {
 
 namespace {
 
 const gfx::AcceleratedWidget kDefaultWidgetHandle = 1;
 
 class CacaSurface : public gfx::SurfaceOzoneCanvas {
  public:
   CacaSurface(CacaConnection* connection);
   virtual ~CacaSurface();
 
   bool Initialize();
 
   // gfx::SurfaceOzoneCanvas overrides:
   virtual skia::RefPtr<SkCanvas> GetCanvas() OVERRIDE;
-  virtual bool ResizeCanvas(const gfx::Size& viewport_size) OVERRIDE;
-  virtual bool PresentCanvas() OVERRIDE;
+  virtual void ResizeCanvas(const gfx::Size& viewport_size) OVERRIDE;
+  virtual void PresentCanvas(const gfx::Rect& damage) OVERRIDE;
   virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE;
 
  private:
   CacaConnection* connection_;  // Not owned.
 
   caca_dither_t* dither_;
 
   skia::RefPtr<SkSurface> surface_;
 
   DISALLOW_COPY_AND_ASSIGN(CacaSurface);
@@ skipping 28 matching lines @@
       0x000000ff,
       0xff000000);
 
   return true;
 }
 
 skia::RefPtr<SkCanvas> CacaSurface::GetCanvas() {
   return skia::SharePtr<SkCanvas>(surface_->getCanvas());
 }
 
-bool CacaSurface::ResizeCanvas(const gfx::Size& viewport_size) {
+void CacaSurface::ResizeCanvas(const gfx::Size& viewport_size) {
   NOTIMPLEMENTED();
-  return false;
 }
 
-bool CacaSurface::PresentCanvas() {
+void CacaSurface::PresentCanvas(const gfx::Rect& damage) {
   SkImageInfo info;
   size_t row_bytes;
   const void* pixels = surface_->peekPixels(&info, &row_bytes);
 
   caca_canvas_t* canvas = caca_get_canvas(connection_->display());
   caca_dither_bitmap(canvas, 0, 0,
                      caca_get_canvas_width(canvas),
                      caca_get_canvas_height(canvas),
                      dither_,
                      static_cast<const uint8_t*>(pixels));
   caca_refresh_display(connection_->display());
-
-  return true;
 }
 
 scoped_ptr<gfx::VSyncProvider> CacaSurface::CreateVSyncProvider() {
   return scoped_ptr<gfx::VSyncProvider>();
 }
 
 }  // namespace
 
 CacaSurfaceFactory::CacaSurfaceFactory(CacaConnection* connection)
     : state_(UNINITIALIZED),
@@ skipping 32 matching lines @@
     gfx::AcceleratedWidget widget) {
   CHECK_EQ(INITIALIZED, state_);
   CHECK_EQ(kDefaultWidgetHandle, widget);
 
   scoped_ptr<CacaSurface> canvas(new CacaSurface(connection_));
   CHECK(canvas->Initialize());
   return canvas.PassAs<gfx::SurfaceOzoneCanvas>();
 }
 
 }  // namespace ui