[Ozone-DRI] Listen for swap events

ui/ozone/platform/dri/hardware_display_controller_unittest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/ozone/platform/dri/crtc_controller.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/test/mock_dri_wrapper.h"
 #include "ui/ozone/public/native_pixmap.h"
 
 namespace {
@@ skipping 25 matching lines @@
 
   gfx::Size size_;
 
   DISALLOW_COPY_AND_ASSIGN(MockScanoutBuffer);
 };
 
 }  // namespace
 
 class HardwareDisplayControllerTest : public testing::Test {
  public:
-  HardwareDisplayControllerTest() {}
+  HardwareDisplayControllerTest() : page_flips_(0) {}
   ~HardwareDisplayControllerTest() override {}
 
   void SetUp() override;
   void TearDown() override;
 
+  void PageFlipCallback();
+
  protected:
   scoped_ptr<ui::HardwareDisplayController> controller_;
   scoped_ptr<ui::MockDriWrapper> drm_;
 
+  int page_flips_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(HardwareDisplayControllerTest);
 };
 
 void HardwareDisplayControllerTest::SetUp() {
   std::vector<uint32_t> crtcs;
   crtcs.push_back(kPrimaryCrtc);
   crtcs.push_back(kSecondaryCrtc);
   drm_.reset(new ui::MockDriWrapper(3, crtcs, kPlanesPerCrtc));
   controller_.reset(new ui::HardwareDisplayController(
       scoped_ptr<ui::CrtcController>(new ui::CrtcController(
           drm_.get(), kPrimaryCrtc, kPrimaryConnector))));
 }
 
 void HardwareDisplayControllerTest::TearDown() {
   controller_.reset();
   drm_.reset();
 }
 
+void HardwareDisplayControllerTest::PageFlipCallback() {
+  page_flips_++;
+}
+
 TEST_F(HardwareDisplayControllerTest, CheckModesettingResult) {
   ui::OverlayPlane plane(scoped_refptr<ui::ScanoutBuffer>(
       new MockScanoutBuffer(kDefaultModeSize)));
 
   EXPECT_TRUE(controller_->Modeset(plane, kDefaultMode));
   EXPECT_FALSE(plane.buffer->HasOneRef());
 }
 
 TEST_F(HardwareDisplayControllerTest, CheckStateAfterPageFlip) {
   ui::OverlayPlane plane1(scoped_refptr<ui::ScanoutBuffer>(
       new MockScanoutBuffer(kDefaultModeSize)));
 
   EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode));
 
   ui::OverlayPlane plane2(scoped_refptr<ui::ScanoutBuffer>(
       new MockScanoutBuffer(kDefaultModeSize)));
   controller_->QueueOverlayPlane(plane2);
-  EXPECT_TRUE(controller_->SchedulePageFlip());
-  controller_->WaitForPageFlipEvent();
+  EXPECT_TRUE(controller_->SchedulePageFlip(
+      base::Bind(&HardwareDisplayControllerTest::PageFlipCallback,
+                 base::Unretained(this))));
   EXPECT_TRUE(plane1.buffer->HasOneRef());
   EXPECT_FALSE(plane2.buffer->HasOneRef());
 
   EXPECT_EQ(1, drm_->get_page_flip_call_count());
   EXPECT_EQ(0, drm_->get_overlay_flip_call_count());
 }
 
 TEST_F(HardwareDisplayControllerTest, CheckStateIfModesetFails) {
   drm_->set_set_crtc_expectation(false);
 
   ui::OverlayPlane plane(scoped_refptr<ui::ScanoutBuffer>(new MockScanoutBuffer(
       kDefaultModeSize)));
 
   EXPECT_FALSE(controller_->Modeset(plane, kDefaultMode));
 }
 
 TEST_F(HardwareDisplayControllerTest, CheckStateIfPageFlipFails) {
   drm_->set_page_flip_expectation(false);
 
   ui::OverlayPlane plane1(scoped_refptr<ui::ScanoutBuffer>(
       new MockScanoutBuffer(kDefaultModeSize)));
 
   EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode));
 
   ui::OverlayPlane plane2(scoped_refptr<ui::ScanoutBuffer>(
       new MockScanoutBuffer(kDefaultModeSize)));
   controller_->QueueOverlayPlane(plane2);
-  EXPECT_FALSE(controller_->SchedulePageFlip());
-  EXPECT_FALSE(plane1.buffer->HasOneRef());
-  EXPECT_FALSE(plane2.buffer->HasOneRef());
+  EXPECT_FALSE(controller_->SchedulePageFlip(
+      base::Bind(&HardwareDisplayControllerTest::PageFlipCallback,
+                 base::Unretained(this))));
 
-  controller_->WaitForPageFlipEvent();
   EXPECT_FALSE(plane1.buffer->HasOneRef());
   EXPECT_TRUE(plane2.buffer->HasOneRef());
 }
 
 TEST_F(HardwareDisplayControllerTest, VerifyNoDRMCallsWhenDisabled) {
   ui::OverlayPlane plane1(scoped_refptr<ui::ScanoutBuffer>(
       new MockScanoutBuffer(kDefaultModeSize)));
 
   EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode));
   controller_->Disable();
   ui::OverlayPlane plane2(scoped_refptr<ui::ScanoutBuffer>(
       new MockScanoutBuffer(kDefaultModeSize)));
   controller_->QueueOverlayPlane(plane2);
-  EXPECT_TRUE(controller_->SchedulePageFlip());
-  controller_->WaitForPageFlipEvent();
+  EXPECT_TRUE(controller_->SchedulePageFlip(
+      base::Bind(&HardwareDisplayControllerTest::PageFlipCallback,
+                 base::Unretained(this))));
   EXPECT_EQ(0, drm_->get_page_flip_call_count());
 
   EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode));
   controller_->QueueOverlayPlane(plane2);
-  EXPECT_TRUE(controller_->SchedulePageFlip());
-  controller_->WaitForPageFlipEvent();
+  EXPECT_TRUE(controller_->SchedulePageFlip(
+      base::Bind(&HardwareDisplayControllerTest::PageFlipCallback,
+                 base::Unretained(this))));
   EXPECT_EQ(1, drm_->get_page_flip_call_count());
 }
 
 TEST_F(HardwareDisplayControllerTest, CheckOverlayPresent) {
   ui::OverlayPlane plane1(scoped_refptr<ui::ScanoutBuffer>(
       new MockScanoutBuffer(kDefaultModeSize)));
   ui::OverlayPlane plane2(
       scoped_refptr<ui::ScanoutBuffer>(new MockScanoutBuffer(kDefaultModeSize)),
       1,
       gfx::OVERLAY_TRANSFORM_NONE,
       gfx::Rect(kDefaultModeSize),
       gfx::RectF(kDefaultModeSizeF));
 
   EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode));
 
   controller_->QueueOverlayPlane(plane1);
   controller_->QueueOverlayPlane(plane2);
 
-  EXPECT_TRUE(controller_->SchedulePageFlip());
-  controller_->WaitForPageFlipEvent();
+  EXPECT_TRUE(controller_->SchedulePageFlip(
+      base::Bind(&HardwareDisplayControllerTest::PageFlipCallback,
+                 base::Unretained(this))));
   EXPECT_EQ(1, drm_->get_page_flip_call_count());
   EXPECT_EQ(1, drm_->get_overlay_flip_call_count());
 }
 
 TEST_F(HardwareDisplayControllerTest, PageflipMirroredControllers) {
   controller_->AddCrtc(scoped_ptr<ui::CrtcController>(
       new ui::CrtcController(drm_.get(), kSecondaryCrtc, kSecondaryConnector)));
 
   ui::OverlayPlane plane1(scoped_refptr<ui::ScanoutBuffer>(
       new MockScanoutBuffer(kDefaultModeSize)));
   EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode));
   EXPECT_EQ(2, drm_->get_set_crtc_call_count());
 
   ui::OverlayPlane plane2(scoped_refptr<ui::ScanoutBuffer>(
       new MockScanoutBuffer(kDefaultModeSize)));
   controller_->QueueOverlayPlane(plane2);
-  EXPECT_TRUE(controller_->SchedulePageFlip());
+  EXPECT_TRUE(controller_->SchedulePageFlip(
+      base::Bind(&HardwareDisplayControllerTest::PageFlipCallback,
+                 base::Unretained(this))));
   EXPECT_EQ(2, drm_->get_page_flip_call_count());
-
-  controller_->WaitForPageFlipEvent();
-  EXPECT_EQ(2, drm_->get_handle_events_count());
+  EXPECT_EQ(1, page_flips_);
 }
-
-TEST_F(HardwareDisplayControllerTest,
-       PageflipMirroredControllersWithInvertedCrtcOrder) {
-  scoped_ptr<ui::CrtcController> crtc1(
-      new ui::CrtcController(drm_.get(), kPrimaryCrtc, kPrimaryConnector));
-  scoped_ptr<ui::CrtcController> crtc2(
-      new ui::CrtcController(drm_.get(), kSecondaryCrtc, kSecondaryConnector));
-
-  // Make sure that if the order is reversed everything is still fine.
-  std::queue<ui::CrtcController*> crtc_queue;
-  crtc_queue.push(crtc2.get());
-  crtc_queue.push(crtc1.get());
-
-  controller_.reset(new ui::HardwareDisplayController(crtc1.Pass()));
-  controller_->AddCrtc(crtc2.Pass());
-
-  ui::OverlayPlane plane1(scoped_refptr<ui::ScanoutBuffer>(
-      new MockScanoutBuffer(kDefaultModeSize)));
-  EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode));
-  EXPECT_EQ(2, drm_->get_set_crtc_call_count());
-
-  ui::OverlayPlane plane2(scoped_refptr<ui::ScanoutBuffer>(
-      new MockScanoutBuffer(kDefaultModeSize)));
-  controller_->QueueOverlayPlane(plane2);
-  EXPECT_TRUE(controller_->SchedulePageFlip());
-  EXPECT_EQ(2, drm_->get_page_flip_call_count());
-
-  drm_->set_controllers(crtc_queue);
-  controller_->WaitForPageFlipEvent();
-  EXPECT_EQ(2, drm_->get_handle_events_count());
-}