ozone: dri: Composite to intermediate surface & copy

ui/ozone/platform/dri/dri_surface_factory.cc

Index: ui/ozone/platform/dri/dri_surface_factory.cc
diff --git a/ui/ozone/platform/dri/dri_surface_factory.cc b/ui/ozone/platform/dri/dri_surface_factory.cc
index 1a14d41f77a2b4eed284a9bcc4cf31042545cce8..7af725f8cdc934ee99901cfd201ca2b6b7350c55 100644
--- a/ui/ozone/platform/dri/dri_surface_factory.cc
+++ b/ui/ozone/platform/dri/dri_surface_factory.cc
@@ -12,6 +12,7 @@
 #include "base/message_loop/message_loop.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkDevice.h"
+#include "third_party/skia/include/core/SkSurface.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/ozone/surface_ozone_canvas.h"
 #include "ui/ozone/platform/dri/dri_surface.h"
@@ -78,22 +79,37 @@ class DriSurfaceAdapter : public gfx::SurfaceOzoneCanvas {
       : widget_(w), dri_(dri) {}
   virtual ~DriSurfaceAdapter() {}
 
-  // gfx::SurfaceOzoneCanvas overrides:
+  // SurfaceOzoneCanvas:
   virtual skia::RefPtr<SkCanvas> GetCanvas() OVERRIDE {
-    return skia::SharePtr(dri_->GetCanvasForWidget(widget_));
+    return skia::SharePtr(surface_->getCanvas());
   }
-  virtual bool ResizeCanvas(const gfx::Size& viewport_size) OVERRIDE {
-    NOTIMPLEMENTED();
-    return false;
+  virtual void ResizeCanvas(const gfx::Size& viewport_size) OVERRIDE {
+    SkImageInfo info = SkImageInfo::MakeN32(
+        viewport_size.width(), viewport_size.height(), kOpaque_SkAlphaType);
+    surface_ = skia::AdoptRef(SkSurface::NewRaster(info));
   }
-  virtual bool PresentCanvas() OVERRIDE {
-    return dri_->SchedulePageFlip(widget_);
+  virtual void PresentCanvas(const gfx::Rect& damage) OVERRIDE {

[rjkroege, 2014/04/23 22:29:32]

shouldn't there be new lines after the } ?

+    SkCanvas* canvas = dri_->GetCanvasForWidget(widget_);
+
+    // The DriSurface is double buffered, so the current back buffer is
+    // missing the previous update. Expand damage region.
+    SkRect real_damage = RectToSkRect(UnionRects(damage, last_damage_));
+
+    // Copy damage region.
+    skia::RefPtr<SkImage> image = skia::AdoptRef(surface_->newImageSnapshot());
+    image->draw(canvas, &real_damage, real_damage, NULL);
+
+    last_damage_ = damage;
+    CHECK(dri_->SchedulePageFlip(widget_));
   }
   virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE {
     return dri_->CreateVSyncProvider(widget_);
   }
 
  private:
+  skia::RefPtr<SkSurface> surface_;
+  gfx::Rect last_damage_;
+
   gfx::AcceleratedWidget widget_;
   DriSurfaceFactory* dri_;
 };