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

Unified Diff: ui/ozone/platform/dri/hardware_display_controller_unittest.cc

Issue 276753003: [Ozone-DRI] Move framebuffer initialization into the buffer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 7 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/ozone/platform/dri/hardware_display_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/dri/hardware_display_controller_unittest.cc
diff --git a/ui/ozone/platform/dri/hardware_display_controller_unittest.cc b/ui/ozone/platform/dri/hardware_display_controller_unittest.cc
index d809b9bb9a42215a1a66aecb1e7cb408bdc462db..4643fedb7776577cbb890d7487b6e1906423e745 100644
--- a/ui/ozone/platform/dri/hardware_display_controller_unittest.cc
+++ b/ui/ozone/platform/dri/hardware_display_controller_unittest.cc
@@ -65,7 +65,8 @@ class MockDriWrapper : public ui::DriWrapper {
return true;
}
- virtual bool AddFramebuffer(const drmModeModeInfo& mode,
+ virtual bool AddFramebuffer(uint32_t width,
+ uint32_t height,
uint8_t depth,
uint8_t bpp,
uint32_t stride,
@@ -226,24 +227,9 @@ TEST_F(HardwareDisplayControllerTest, CheckStateAfterSurfaceIsBound) {
EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(),
kDefaultMode));
- EXPECT_EQ(2, drm_->get_add_framebuffer_call_count());
EXPECT_TRUE(controller_->get_surface() != NULL);
}
-TEST_F(HardwareDisplayControllerTest, CheckStateIfBindingFails) {
- drm_->set_add_framebuffer_expectation(false);
-
- scoped_ptr<ui::DriSurface> surface(
- new MockDriSurface(drm_.get(), kDefaultModeSize));
-
- EXPECT_TRUE(surface->Initialize());
- EXPECT_FALSE(controller_->BindSurfaceToController(surface.Pass(),
- kDefaultMode));
-
- EXPECT_EQ(1, drm_->get_add_framebuffer_call_count());
- EXPECT_EQ(NULL, controller_->get_surface());
-}
-
TEST_F(HardwareDisplayControllerTest, CheckStateAfterPageFlip) {
scoped_ptr<ui::DriSurface> surface(
new MockDriSurface(drm_.get(), kDefaultModeSize));
@@ -279,17 +265,3 @@ TEST_F(HardwareDisplayControllerTest, CheckStateIfPageFlipFails) {
kDefaultMode));
EXPECT_FALSE(controller_->SchedulePageFlip());
}
-
-TEST_F(HardwareDisplayControllerTest, CheckProperDestruction) {
- scoped_ptr<ui::DriSurface> surface(
- new MockDriSurface(drm_.get(), kDefaultModeSize));
-
- EXPECT_TRUE(surface->Initialize());
- EXPECT_TRUE(controller_->BindSurfaceToController(surface.Pass(),
- kDefaultMode));
- EXPECT_TRUE(controller_->get_surface() != NULL);
-
- controller_.reset();
-
- EXPECT_EQ(2, drm_->get_remove_framebuffer_call_count());
-}
« no previous file with comments | « ui/ozone/platform/dri/hardware_display_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698