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

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: rebase 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
« no previous file with comments | « ui/gfx/ozone/dri/dri_surface_factory.cc ('k') | ui/gfx/ozone/impl/file_surface_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b0e108e6dd8325623d0802421eaba16f50cec2d5..1c1fb3f76f5981f5eafaceb91f9bd23aa1806634 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(
« no previous file with comments | « ui/gfx/ozone/dri/dri_surface_factory.cc ('k') | ui/gfx/ozone/impl/file_surface_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698