ozone: dri: Composite to intermediate surface & copy

content/browser/compositor/software_output_device_ozone_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/output/software_frame_data.h"
 #include "content/browser/compositor/software_output_device_ozone.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/test/context_factories_for_test.h"
 #include "ui/gfx/ozone/surface_factory_ozone.h"
 #include "ui/gfx/ozone/surface_ozone_canvas.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/skia_util.h"
 #include "ui/gfx/vsync_provider.h"
 #include "ui/gl/gl_implementation.h"
 
 namespace {
 
 class MockSurfaceOzone : public gfx::SurfaceOzoneCanvas {
  public:
   MockSurfaceOzone() {}
   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 {
-    NOTIMPLEMENTED();
-    return true;
-  }
+  virtual void PresentCanvas(const gfx::Rect& damage) OVERRIDE {}
   virtual scoped_ptr<gfx::VSyncProvider> CreateVSyncProvider() OVERRIDE {
     return scoped_ptr<gfx::VSyncProvider>();
   }
 
  private:
   skia::RefPtr<SkSurface> surface_;
 
   DISALLOW_COPY_AND_ASSIGN(MockSurfaceOzone);
 };
 
@@ skipping 81 matching lines @@
     : public SoftwareOutputDeviceOzoneTest {
  protected:
   virtual void SetUp() OVERRIDE;
 };
 
 void SoftwareOutputDeviceOzonePixelTest::SetUp() {
   enable_pixel_output_ = true;
   SoftwareOutputDeviceOzoneTest::SetUp();
 }
 
-TEST_F(SoftwareOutputDeviceOzoneTest, CheckClipAfterBeginPaint) {
-  gfx::Rect damage(10, 10, 100, 100);
-  SkCanvas* canvas = output_device_->BeginPaint(damage);
-
-  SkIRect sk_bounds;
-  canvas->getClipDeviceBounds(&sk_bounds);
-
-  EXPECT_EQ(damage.ToString(), gfx::SkIRectToRect(sk_bounds).ToString());
-}
-
-TEST_F(SoftwareOutputDeviceOzoneTest, CheckClipAfterSecondBeginPaint) {
-  gfx::Rect damage(10, 10, 100, 100);
-  SkCanvas* canvas = output_device_->BeginPaint(damage);
-
-  cc::SoftwareFrameData frame;
-  output_device_->EndPaint(&frame);
-
-  damage = gfx::Rect(100, 100, 100, 100);
-  canvas = output_device_->BeginPaint(damage);
-  SkIRect sk_bounds;
-  canvas->getClipDeviceBounds(&sk_bounds);
-
-  EXPECT_EQ(damage.ToString(), gfx::SkIRectToRect(sk_bounds).ToString());
-}
-
 TEST_F(SoftwareOutputDeviceOzoneTest, CheckCorrectResizeBehavior) {
   gfx::Rect damage(0, 0, 100, 100);
   gfx::Size size(200, 100);
   // Reduce size.
   output_device_->Resize(size);
 
   SkCanvas* canvas = output_device_->BeginPaint(damage);
   gfx::Size canvas_size(canvas->getDeviceSize().width(),
                         canvas->getDeviceSize().height());
   EXPECT_EQ(size.ToString(), canvas_size.ToString());
@@ skipping 18 matching lines @@
 
   // Clear the background to black.
   canvas->drawColor(SK_ColorBLACK);
 
   cc::SoftwareFrameData frame;
   output_device_->EndPaint(&frame);
 
   // Draw a white rectangle.
   gfx::Rect damage(area.width() / 2, area.height() / 2);
   canvas = output_device_->BeginPaint(damage);
+  canvas->clipRect(gfx::RectToSkRect(damage), SkRegion::kReplace_Op);
 
   canvas->drawColor(SK_ColorWHITE);
 
   output_device_->EndPaint(&frame);
 
   SkPMColor pixels[width * height];
   output_device_->CopyToPixels(area, pixels);
 
   // Check that the copied bitmap contains the same pixel values as what we
   // painted.
   const SkPMColor white = SkPreMultiplyColor(SK_ColorWHITE);
   const SkPMColor black = SkPreMultiplyColor(SK_ColorBLACK);
   for (int i = 0; i < area.height(); ++i) {
     for (int j = 0; j < area.width(); ++j) {
       if (j < damage.width() && i < damage.height())
         EXPECT_EQ(white, pixels[i * area.width() + j]);
       else
         EXPECT_EQ(black, pixels[i * area.width() + j]);
     }
   }
 }