Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8)

Unified Diff: ui/gfx/ozone/dri/dri_surface_factory_unittest.cc

Issue 205433002: ozone: Add OzoneSurface object that is owned by compositor, GLSurface (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add missing InitializeCanvas to FileSurface Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/gfx/ozone/dri/dri_surface_factory_unittest.cc
diff --git a/ui/gfx/ozone/dri/dri_surface_factory_unittest.cc b/ui/gfx/ozone/dri/dri_surface_factory_unittest.cc
index d9c81229516107f24b2ebc0778d39a99cbb8e955..74f4d06da1bed9ae1135cc0a2745f2690a2a2266 100644
--- a/ui/gfx/ozone/dri/dri_surface_factory_unittest.cc
+++ b/ui/gfx/ozone/dri/dri_surface_factory_unittest.cc
@@ -263,7 +263,7 @@ TEST_F(DriSurfaceFactoryTest, FailSurfaceInitialization) {
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) {
@@ -275,7 +275,7 @@ TEST_F(DriSurfaceFactoryTest, FailBindingSurfaceToController) {
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) {
@@ -285,7 +285,7 @@ TEST_F(DriSurfaceFactoryTest, SuccessfulWidgetRealization) {
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) {
@@ -297,7 +297,8 @@ TEST_F(DriSurfaceFactoryTest, FailSchedulePageFlip) {
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));
}
@@ -309,7 +310,8 @@ TEST_F(DriSurfaceFactoryTest, SuccessfulSchedulePageFlip) {
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));
}
@@ -320,7 +322,9 @@ TEST_F(DriSurfaceFactoryTest, SetCursorImage) {
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(

Powered by Google App Engine
This is Rietveld 408576698