ozone: dri: Composite to intermediate surface & copy

ui/ozone/platform/dri/dri_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/dri/dri_surface_factory.h"
 
 #include <drm.h>
 #include <errno.h>
 #include <xf86drm.h>
 
 #include "base/debug/trace_event.h"
 #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"
 #include "ui/ozone/platform/dri/dri_util.h"
 #include "ui/ozone/platform/dri/dri_vsync_provider.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 
 namespace ui {
 
@@ skipping 46 matching lines @@
 // For DRI the hadware surface & canvas are owned by the platform, so
 // the compositor merely owns this proxy object.
 //
 // TODO(spang): Should the compositor own any bits of the DriSurface?
 class DriSurfaceAdapter : public gfx::SurfaceOzoneCanvas {
  public:
   DriSurfaceAdapter(gfx::AcceleratedWidget w, DriSurfaceFactory* dri)
       : 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;
+    SkImageInfo info = SkImageInfo::MakeN32(

[danakj, 2014/04/23 19:05:38]

Is there any test to show this working now?

[spang, 2014/04/23 20:57:18]

Resize at runtime isn't really supported. I'm using this to create the surface
once the initial size is known.

A resize here does not actually affect the scanout buffer size, since that's
tied to the display mode.

If the sizes don't match, we'll just copy to the top left corner of the scanout
buffer and lose any excess. Given that resize after initialization is never
attempted, this seems fine.

+        viewport_size.width(), viewport_size.height(), kOpaque_SkAlphaType);
+    surface_ = skia::AdoptRef(SkSurface::NewRaster(info));
+    return true;
   }
-  virtual bool PresentCanvas() OVERRIDE {
+  virtual bool PresentCanvas(const gfx::Rect& damage) OVERRIDE {
+    SkCanvas* canvas = dri_->GetCanvasForWidget(widget_);
+    SkRect real_damage = RectToSkRect(UnionRects(damage, last_damage_));

[danakj, 2014/04/23 19:05:38]

Why do you always present a damage rect for two calls to PresentCanvas?

[spang, 2014/04/23 20:57:18]

The incoming buffer is missing the prior update due to double buffering. I will
update with a comment.

+
+    // Copy damage region.
+    skia::RefPtr<SkImage> image = skia::AdoptRef(surface_->newImageSnapshot());
+    image->draw(canvas, &real_damage, real_damage, NULL);
+
+    last_damage_ = damage;
     return 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_;
 };
 
 }  // namespace
 
 // static
 const gfx::AcceleratedWidget DriSurfaceFactory::kDefaultWidgetHandle = 1;
 
 DriSurfaceFactory::DriSurfaceFactory()
@@ skipping 241 matching lines @@
 
 HardwareDisplayController* DriSurfaceFactory::GetControllerForWidget(
     gfx::AcceleratedWidget w) {
   CHECK_GE(w, 1);
   CHECK_LE(static_cast<size_t>(w), controllers_.size());
 
   return controllers_[w - 1];
 }
 
 }  // namespace ui