ozone: Add OzoneSurface object that is owned by compositor, GLSurface

ui/gfx/ozone/dri/dri_surface_factory_unittest.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 <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 245 matching lines @@
 
 TEST_F(DriSurfaceFactoryTest, FailSurfaceInitialization) {
   factory_->set_initialize_controller_expectation(false);
 
   EXPECT_EQ(gfx::SurfaceFactoryOzone::INITIALIZED,
             factory_->InitializeHardware());
 
   gfx::AcceleratedWidget w = factory_->GetAcceleratedWidget();
   EXPECT_EQ(kDefaultWidgetHandle, w);
 
-  EXPECT_EQ(gfx::kNullAcceleratedWidget, factory_->RealizeAcceleratedWidget(w));
+  EXPECT_FALSE(factory_->CreateSurfaceForWidget(w));
 }
 
 TEST_F(DriSurfaceFactoryTest, FailBindingSurfaceToController) {
   EXPECT_EQ(gfx::SurfaceFactoryOzone::INITIALIZED,
             factory_->InitializeHardware());
 
   factory_->get_drm()->set_add_framebuffer_expectation(false);
 
   gfx::AcceleratedWidget w = factory_->GetAcceleratedWidget();
   EXPECT_EQ(kDefaultWidgetHandle, w);
 
-  EXPECT_EQ(gfx::kNullAcceleratedWidget, factory_->RealizeAcceleratedWidget(w));
+  EXPECT_FALSE(factory_->CreateSurfaceForWidget(w));
 }
 
 TEST_F(DriSurfaceFactoryTest, SuccessfulWidgetRealization) {
   EXPECT_EQ(gfx::SurfaceFactoryOzone::INITIALIZED,
             factory_->InitializeHardware());
 
   gfx::AcceleratedWidget w = factory_->GetAcceleratedWidget();
   EXPECT_EQ(kDefaultWidgetHandle, w);
 
-  EXPECT_NE(gfx::kNullAcceleratedWidget, factory_->RealizeAcceleratedWidget(w));
+  EXPECT_TRUE(factory_->CreateSurfaceForWidget(w));
 }
 
 TEST_F(DriSurfaceFactoryTest, FailSchedulePageFlip) {
   EXPECT_EQ(gfx::SurfaceFactoryOzone::INITIALIZED,
             factory_->InitializeHardware());
 
   factory_->get_drm()->set_page_flip_expectation(false);
 
   gfx::AcceleratedWidget w = factory_->GetAcceleratedWidget();
   EXPECT_EQ(kDefaultWidgetHandle, w);
 
-  EXPECT_NE(gfx::kNullAcceleratedWidget, factory_->RealizeAcceleratedWidget(w));
+  scoped_ptr<gfx::SurfaceOzone> surf = factory_->CreateSurfaceForWidget(w);
+  EXPECT_TRUE(surf);
 
   EXPECT_FALSE(factory_->SchedulePageFlip(w));
 }
 
 TEST_F(DriSurfaceFactoryTest, SuccessfulSchedulePageFlip) {
   EXPECT_EQ(gfx::SurfaceFactoryOzone::INITIALIZED,
             factory_->InitializeHardware());
 
   gfx::AcceleratedWidget w = factory_->GetAcceleratedWidget();
   EXPECT_EQ(kDefaultWidgetHandle, w);
 
-  EXPECT_NE(gfx::kNullAcceleratedWidget, factory_->RealizeAcceleratedWidget(w));
+  scoped_ptr<gfx::SurfaceOzone> surf = factory_->CreateSurfaceForWidget(w);
+  EXPECT_TRUE(surf);
 
   EXPECT_TRUE(factory_->SchedulePageFlip(w));
 }
 
 TEST_F(DriSurfaceFactoryTest, SetCursorImage) {
   EXPECT_EQ(gfx::SurfaceFactoryOzone::INITIALIZED,
             factory_->InitializeHardware());
 
   gfx::AcceleratedWidget w = factory_->GetAcceleratedWidget();
   EXPECT_EQ(kDefaultWidgetHandle, w);
-  EXPECT_NE(gfx::kNullAcceleratedWidget, factory_->RealizeAcceleratedWidget(w));
+
+  scoped_ptr<gfx::SurfaceOzone> surf = factory_->CreateSurfaceForWidget(w);
+  EXPECT_TRUE(surf);
 
   SkBitmap image;
   SkImageInfo info = SkImageInfo::Make(
       6, 4, kPMColor_SkColorType, kPremul_SkAlphaType);
   image.allocPixels(info);
   image.eraseColor(SK_ColorWHITE);
 
   factory_->SetHardwareCursor(w, image, gfx::Point(4, 2));
   const std::vector<MockDriSurface*>& surfaces = factory_->get_surfaces();
 
   // The first surface is the cursor surface since it is allocated early in the
   // initialization process.
   const std::vector<MockDriSkBitmap*>& bitmaps = surfaces[0]->bitmaps();
 
   // The surface should have been initialized to a double-buffered surface.
   EXPECT_EQ(2u, bitmaps.size());
   // Check that the frontbuffer is displaying the right image as set above.
   for (int i = 0; i < bitmaps[1]->height(); ++i) {
     for (int j = 0; j < bitmaps[1]->width(); ++j) {
       if (j < info.width() && i < info.height())
         EXPECT_EQ(SK_ColorWHITE, bitmaps[1]->getColor(j, i));
       else
         EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT),
                   bitmaps[1]->getColor(j, i));
     }
   }
 }