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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 908993003: [Ozone-Dri] Rename DriWrapper to DrmDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@udl3-pass-drm-fd
Patch Set: rebased Created 5 years, 10 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/screen_manager.cc ('k') | ui/ozone/platform/dri/test/mock_dri_wrapper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/dri/screen_manager_unittest.cc
diff --git a/ui/ozone/platform/dri/screen_manager_unittest.cc b/ui/ozone/platform/dri/screen_manager_unittest.cc
index 1501b711acb3dd76045fe2aad66bf14e69262930..58e08d1a3268b09dd39e2ccceb564293557ffa5f 100644
--- a/ui/ozone/platform/dri/screen_manager_unittest.cc
+++ b/ui/ozone/platform/dri/screen_manager_unittest.cc
@@ -7,7 +7,7 @@
#include "ui/ozone/platform/dri/dri_buffer.h"
#include "ui/ozone/platform/dri/hardware_display_controller.h"
#include "ui/ozone/platform/dri/screen_manager.h"
-#include "ui/ozone/platform/dri/test/mock_dri_wrapper.h"
+#include "ui/ozone/platform/dri/test/mock_drm_device.h"
namespace {
@@ -64,7 +64,7 @@ class ScreenManagerTest : public testing::Test {
}
void SetUp() override {
- dri_ = new ui::MockDriWrapper();
+ drm_ = new ui::MockDrmDevice();
buffer_generator_.reset(new ui::DriBufferGenerator());
screen_manager_.reset(new ui::ScreenManager(buffer_generator_.get()));
screen_manager_->AddObserver(&observer_);
@@ -72,11 +72,11 @@ class ScreenManagerTest : public testing::Test {
void TearDown() override {
screen_manager_->RemoveObserver(&observer_);
screen_manager_.reset();
- dri_ = nullptr;
+ drm_ = nullptr;
}
protected:
- scoped_refptr<ui::MockDriWrapper> dri_;
+ scoped_refptr<ui::MockDrmDevice> drm_;
scoped_ptr<ui::DriBufferGenerator> buffer_generator_;
scoped_ptr<ui::ScreenManager> screen_manager_;
@@ -91,21 +91,21 @@ TEST_F(ScreenManagerTest, CheckWithNoControllers) {
}
TEST_F(ScreenManagerTest, CheckWithValidController) {
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
ui::HardwareDisplayController* controller =
screen_manager_->GetDisplayController(GetPrimaryBounds());
EXPECT_TRUE(controller);
- EXPECT_TRUE(controller->HasCrtc(dri_, kPrimaryCrtc));
+ EXPECT_TRUE(controller->HasCrtc(drm_, kPrimaryCrtc));
}
TEST_F(ScreenManagerTest, CheckWithInvalidBounds) {
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
EXPECT_TRUE(screen_manager_->GetDisplayController(GetPrimaryBounds()));
@@ -113,14 +113,14 @@ TEST_F(ScreenManagerTest, CheckWithInvalidBounds) {
}
TEST_F(ScreenManagerTest, CheckForSecondValidController) {
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
- screen_manager_->AddDisplayController(dri_, kSecondaryCrtc,
+ screen_manager_->AddDisplayController(drm_, kSecondaryCrtc,
kSecondaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kSecondaryCrtc, kSecondaryConnector, GetSecondaryBounds().origin(),
+ drm_, kSecondaryCrtc, kSecondaryConnector, GetSecondaryBounds().origin(),
kDefaultMode);
EXPECT_TRUE(screen_manager_->GetDisplayController(GetPrimaryBounds()));
@@ -128,33 +128,33 @@ TEST_F(ScreenManagerTest, CheckForSecondValidController) {
}
TEST_F(ScreenManagerTest, CheckControllerAfterItIsRemoved) {
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
EXPECT_EQ(1, observer_.num_displays_changed());
EXPECT_EQ(0, observer_.num_displays_removed());
EXPECT_TRUE(screen_manager_->GetDisplayController(GetPrimaryBounds()));
- screen_manager_->RemoveDisplayController(dri_, kPrimaryCrtc);
+ screen_manager_->RemoveDisplayController(drm_, kPrimaryCrtc);
EXPECT_EQ(1, observer_.num_displays_changed());
EXPECT_EQ(1, observer_.num_displays_removed());
EXPECT_FALSE(screen_manager_->GetDisplayController(GetPrimaryBounds()));
}
TEST_F(ScreenManagerTest, CheckDuplicateConfiguration) {
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
- uint32_t framebuffer = dri_->current_framebuffer();
+ uint32_t framebuffer = drm_->current_framebuffer();
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
// Should reuse existing framebuffer.
- EXPECT_EQ(framebuffer, dri_->current_framebuffer());
+ EXPECT_EQ(framebuffer, drm_->current_framebuffer());
EXPECT_EQ(2, observer_.num_displays_changed());
EXPECT_EQ(0, observer_.num_displays_removed());
@@ -164,14 +164,14 @@ TEST_F(ScreenManagerTest, CheckDuplicateConfiguration) {
}
TEST_F(ScreenManagerTest, CheckChangingMode) {
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
drmModeModeInfo new_mode = kDefaultMode;
new_mode.vdisplay = 10;
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
new_mode);
EXPECT_EQ(2, observer_.num_displays_changed());
@@ -187,14 +187,14 @@ TEST_F(ScreenManagerTest, CheckChangingMode) {
}
TEST_F(ScreenManagerTest, CheckForControllersInMirroredMode) {
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
- screen_manager_->AddDisplayController(dri_, kSecondaryCrtc,
+ screen_manager_->AddDisplayController(drm_, kSecondaryCrtc,
kSecondaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kSecondaryCrtc, kSecondaryConnector, GetPrimaryBounds().origin(),
+ drm_, kSecondaryCrtc, kSecondaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
EXPECT_EQ(2, observer_.num_displays_changed());
@@ -204,55 +204,55 @@ TEST_F(ScreenManagerTest, CheckForControllersInMirroredMode) {
}
TEST_F(ScreenManagerTest, CheckMirrorModeTransitions) {
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
- screen_manager_->AddDisplayController(dri_, kSecondaryCrtc,
+ screen_manager_->AddDisplayController(drm_, kSecondaryCrtc,
kSecondaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kSecondaryCrtc, kSecondaryConnector, GetSecondaryBounds().origin(),
+ drm_, kSecondaryCrtc, kSecondaryConnector, GetSecondaryBounds().origin(),
kDefaultMode);
EXPECT_TRUE(screen_manager_->GetDisplayController(GetPrimaryBounds()));
EXPECT_TRUE(screen_manager_->GetDisplayController(GetSecondaryBounds()));
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
screen_manager_->ConfigureDisplayController(
- dri_, kSecondaryCrtc, kSecondaryConnector, GetPrimaryBounds().origin(),
+ drm_, kSecondaryCrtc, kSecondaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
EXPECT_TRUE(screen_manager_->GetDisplayController(GetPrimaryBounds()));
EXPECT_FALSE(screen_manager_->GetDisplayController(GetSecondaryBounds()));
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetSecondaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetSecondaryBounds().origin(),
kDefaultMode);
screen_manager_->ConfigureDisplayController(
- dri_, kSecondaryCrtc, kSecondaryConnector, GetPrimaryBounds().origin(),
+ drm_, kSecondaryCrtc, kSecondaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
EXPECT_TRUE(screen_manager_->GetDisplayController(GetPrimaryBounds()));
EXPECT_TRUE(screen_manager_->GetDisplayController(GetSecondaryBounds()));
}
TEST_F(ScreenManagerTest, MonitorGoneInMirrorMode) {
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
- screen_manager_->AddDisplayController(dri_, kSecondaryCrtc,
+ screen_manager_->AddDisplayController(drm_, kSecondaryCrtc,
kSecondaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kSecondaryCrtc, kSecondaryConnector, GetPrimaryBounds().origin(),
+ drm_, kSecondaryCrtc, kSecondaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
EXPECT_EQ(2, observer_.num_displays_changed());
EXPECT_EQ(1, observer_.num_displays_removed());
- screen_manager_->RemoveDisplayController(dri_, kSecondaryCrtc);
+ screen_manager_->RemoveDisplayController(drm_, kSecondaryCrtc);
EXPECT_TRUE(screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode));
EXPECT_EQ(3, observer_.num_displays_changed());
EXPECT_EQ(1, observer_.num_displays_removed());
@@ -262,23 +262,23 @@ TEST_F(ScreenManagerTest, MonitorGoneInMirrorMode) {
}
TEST_F(ScreenManagerTest, DoNotEnterMirrorModeUnlessSameBounds) {
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
- screen_manager_->AddDisplayController(dri_, kSecondaryCrtc,
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kSecondaryCrtc,
kSecondaryConnector);
// Configure displays in extended mode.
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
screen_manager_->ConfigureDisplayController(
- dri_, kSecondaryCrtc, kSecondaryConnector, GetSecondaryBounds().origin(),
+ drm_, kSecondaryCrtc, kSecondaryConnector, GetSecondaryBounds().origin(),
kDefaultMode);
drmModeModeInfo new_mode = kDefaultMode;
new_mode.vdisplay = 10;
// Shouldn't enter mirror mode unless the display bounds are the same.
screen_manager_->ConfigureDisplayController(
- dri_, kSecondaryCrtc, kSecondaryConnector, GetPrimaryBounds().origin(),
+ drm_, kSecondaryCrtc, kSecondaryConnector, GetPrimaryBounds().origin(),
new_mode);
EXPECT_FALSE(
@@ -286,34 +286,34 @@ TEST_F(ScreenManagerTest, DoNotEnterMirrorModeUnlessSameBounds) {
}
TEST_F(ScreenManagerTest, ReuseFramebufferIfDisabledThenReEnabled) {
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
- uint32_t framebuffer = dri_->current_framebuffer();
+ uint32_t framebuffer = drm_->current_framebuffer();
- screen_manager_->DisableDisplayController(dri_, kPrimaryCrtc);
- EXPECT_EQ(0u, dri_->current_framebuffer());
+ screen_manager_->DisableDisplayController(drm_, kPrimaryCrtc);
+ EXPECT_EQ(0u, drm_->current_framebuffer());
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
// Should reuse existing framebuffer.
- EXPECT_EQ(framebuffer, dri_->current_framebuffer());
+ EXPECT_EQ(framebuffer, drm_->current_framebuffer());
}
TEST_F(ScreenManagerTest, CheckMirrorModeAfterBeginReEnabled) {
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
- screen_manager_->DisableDisplayController(dri_, kPrimaryCrtc);
+ screen_manager_->DisableDisplayController(drm_, kPrimaryCrtc);
- screen_manager_->AddDisplayController(dri_, kSecondaryCrtc,
+ screen_manager_->AddDisplayController(drm_, kSecondaryCrtc,
kSecondaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kSecondaryCrtc, kSecondaryConnector, GetPrimaryBounds().origin(),
+ drm_, kSecondaryCrtc, kSecondaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
ui::HardwareDisplayController* controller =
@@ -322,7 +322,7 @@ TEST_F(ScreenManagerTest, CheckMirrorModeAfterBeginReEnabled) {
EXPECT_FALSE(controller->IsMirrored());
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
EXPECT_TRUE(controller);
EXPECT_TRUE(controller->IsMirrored());
@@ -330,16 +330,16 @@ TEST_F(ScreenManagerTest, CheckMirrorModeAfterBeginReEnabled) {
TEST_F(ScreenManagerTest,
CheckProperConfigurationWithDifferentDeviceAndSameCrtc) {
- scoped_refptr<ui::MockDriWrapper> dri2 = new ui::MockDriWrapper();
+ scoped_refptr<ui::MockDrmDevice> drm2 = new ui::MockDrmDevice();
- screen_manager_->AddDisplayController(dri_, kPrimaryCrtc, kPrimaryConnector);
- screen_manager_->AddDisplayController(dri2, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm_, kPrimaryCrtc, kPrimaryConnector);
+ screen_manager_->AddDisplayController(drm2, kPrimaryCrtc, kPrimaryConnector);
screen_manager_->ConfigureDisplayController(
- dri_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
+ drm_, kPrimaryCrtc, kPrimaryConnector, GetPrimaryBounds().origin(),
kDefaultMode);
screen_manager_->ConfigureDisplayController(
- dri2, kPrimaryCrtc, kPrimaryConnector, GetSecondaryBounds().origin(),
+ drm2, kPrimaryCrtc, kPrimaryConnector, GetSecondaryBounds().origin(),
kDefaultMode);
ui::HardwareDisplayController* controller1 =
@@ -348,6 +348,6 @@ TEST_F(ScreenManagerTest,
screen_manager_->GetDisplayController(GetSecondaryBounds());
EXPECT_NE(controller1, controller2);
- EXPECT_EQ(dri_, controller1->crtc_controllers()[0]->drm());
- EXPECT_EQ(dri2, controller2->crtc_controllers()[0]->drm());
+ EXPECT_EQ(drm_, controller1->crtc_controllers()[0]->drm());
+ EXPECT_EQ(drm2, controller2->crtc_controllers()[0]->drm());
}
« no previous file with comments | « ui/ozone/platform/dri/screen_manager.cc ('k') | ui/ozone/platform/dri/test/mock_dri_wrapper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698