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

Side by Side Diff: ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc

Issue 1084173004: Adding status to swap complete (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, separate out use of the result, add enum Created 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/bind.h" 5 #include "base/bind.h"
6 #include "testing/gtest/include/gtest/gtest.h" 6 #include "testing/gtest/include/gtest/gtest.h"
7 #include "third_party/skia/include/core/SkCanvas.h" 7 #include "third_party/skia/include/core/SkCanvas.h"
8 #include "ui/ozone/platform/drm/gpu/crtc_controller.h" 8 #include "ui/ozone/platform/drm/gpu/crtc_controller.h"
9 #include "ui/ozone/platform/drm/gpu/drm_buffer.h" 9 #include "ui/ozone/platform/drm/gpu/drm_buffer.h"
10 #include "ui/ozone/platform/drm/gpu/drm_device.h" 10 #include "ui/ozone/platform/drm/gpu/drm_device.h"
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 } // namespace 47 } // namespace
48 48
49 class HardwareDisplayControllerTest : public testing::Test { 49 class HardwareDisplayControllerTest : public testing::Test {
50 public: 50 public:
51 HardwareDisplayControllerTest() : page_flips_(0) {} 51 HardwareDisplayControllerTest() : page_flips_(0) {}
52 ~HardwareDisplayControllerTest() override {} 52 ~HardwareDisplayControllerTest() override {}
53 53
54 void SetUp() override; 54 void SetUp() override;
55 void TearDown() override; 55 void TearDown() override;
56 56
57 void PageFlipCallback(); 57 void PageFlipCallback(gfx::SwapResult);
58 58
59 protected: 59 protected:
60 scoped_ptr<ui::HardwareDisplayController> controller_; 60 scoped_ptr<ui::HardwareDisplayController> controller_;
61 scoped_refptr<ui::MockDrmDevice> drm_; 61 scoped_refptr<ui::MockDrmDevice> drm_;
62 62
63 int page_flips_; 63 int page_flips_;
64 64
65 private: 65 private:
66 DISALLOW_COPY_AND_ASSIGN(HardwareDisplayControllerTest); 66 DISALLOW_COPY_AND_ASSIGN(HardwareDisplayControllerTest);
67 }; 67 };
68 68
69 void HardwareDisplayControllerTest::SetUp() { 69 void HardwareDisplayControllerTest::SetUp() {
70 std::vector<uint32_t> crtcs; 70 std::vector<uint32_t> crtcs;
71 crtcs.push_back(kPrimaryCrtc); 71 crtcs.push_back(kPrimaryCrtc);
72 crtcs.push_back(kSecondaryCrtc); 72 crtcs.push_back(kSecondaryCrtc);
73 drm_ = new ui::MockDrmDevice(false, crtcs, kPlanesPerCrtc); 73 drm_ = new ui::MockDrmDevice(false, crtcs, kPlanesPerCrtc);
74 controller_.reset(new ui::HardwareDisplayController( 74 controller_.reset(new ui::HardwareDisplayController(
75 scoped_ptr<ui::CrtcController>(new ui::CrtcController( 75 scoped_ptr<ui::CrtcController>(new ui::CrtcController(
76 drm_.get(), kPrimaryCrtc, kPrimaryConnector)))); 76 drm_.get(), kPrimaryCrtc, kPrimaryConnector))));
77 } 77 }
78 78
79 void HardwareDisplayControllerTest::TearDown() { 79 void HardwareDisplayControllerTest::TearDown() {
80 controller_.reset(); 80 controller_.reset();
81 drm_ = nullptr; 81 drm_ = nullptr;
82 } 82 }
83 83
84 void HardwareDisplayControllerTest::PageFlipCallback() { 84 void HardwareDisplayControllerTest::PageFlipCallback(gfx::SwapResult) {
85 page_flips_++; 85 page_flips_++;
86 } 86 }
87 87
88 TEST_F(HardwareDisplayControllerTest, CheckModesettingResult) { 88 TEST_F(HardwareDisplayControllerTest, CheckModesettingResult) {
89 ui::OverlayPlane plane(scoped_refptr<ui::ScanoutBuffer>( 89 ui::OverlayPlane plane(scoped_refptr<ui::ScanoutBuffer>(
90 new MockScanoutBuffer(kDefaultModeSize))); 90 new MockScanoutBuffer(kDefaultModeSize)));
91 91
92 EXPECT_TRUE(controller_->Modeset(plane, kDefaultMode)); 92 EXPECT_TRUE(controller_->Modeset(plane, kDefaultMode));
93 EXPECT_FALSE(plane.buffer->HasOneRef()); 93 EXPECT_FALSE(plane.buffer->HasOneRef());
94 } 94 }
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 planes, false, 260 planes, false,
261 base::Bind(&HardwareDisplayControllerTest::PageFlipCallback, 261 base::Bind(&HardwareDisplayControllerTest::PageFlipCallback,
262 base::Unretained(this)))); 262 base::Unretained(this))));
263 263
264 controller_->RemoveCrtc(drm_, kPrimaryCrtc); 264 controller_->RemoveCrtc(drm_, kPrimaryCrtc);
265 265
266 EXPECT_EQ(1, page_flips_); 266 EXPECT_EQ(1, page_flips_);
267 drm_->RunCallbacks(); 267 drm_->RunCallbacks();
268 EXPECT_EQ(1, page_flips_); 268 EXPECT_EQ(1, page_flips_);
269 } 269 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698