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

Side by Side Diff: ui/ozone/platform/dri/hardware_display_controller_unittest.cc

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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 "testing/gtest/include/gtest/gtest.h" 5 #include "testing/gtest/include/gtest/gtest.h"
6 #include "third_party/skia/include/core/SkCanvas.h" 6 #include "third_party/skia/include/core/SkCanvas.h"
7 #include "ui/ozone/platform/dri/crtc_controller.h" 7 #include "ui/ozone/platform/dri/crtc_controller.h"
8 #include "ui/ozone/platform/dri/dri_buffer.h" 8 #include "ui/ozone/platform/dri/dri_buffer.h"
9 #include "ui/ozone/platform/dri/dri_wrapper.h" 9 #include "ui/ozone/platform/dri/dri_wrapper.h"
10 #include "ui/ozone/platform/dri/hardware_display_controller.h" 10 #include "ui/ozone/platform/dri/hardware_display_controller.h"
(...skipping 12 matching lines...) Expand all
23 const uint32_t kSecondaryConnector = 4; 23 const uint32_t kSecondaryConnector = 4;
24 24
25 const gfx::Size kDefaultModeSize(kDefaultMode.hdisplay, kDefaultMode.vdisplay); 25 const gfx::Size kDefaultModeSize(kDefaultMode.hdisplay, kDefaultMode.vdisplay);
26 const gfx::SizeF kDefaultModeSizeF(1.0, 1.0); 26 const gfx::SizeF kDefaultModeSizeF(1.0, 1.0);
27 27
28 class MockScanoutBuffer : public ui::ScanoutBuffer { 28 class MockScanoutBuffer : public ui::ScanoutBuffer {
29 public: 29 public:
30 MockScanoutBuffer(const gfx::Size& size) : size_(size) {} 30 MockScanoutBuffer(const gfx::Size& size) : size_(size) {}
31 31
32 // ScanoutBuffer: 32 // ScanoutBuffer:
33 virtual uint32_t GetFramebufferId() const OVERRIDE {return 0; } 33 virtual uint32_t GetFramebufferId() const override {return 0; }
34 virtual uint32_t GetHandle() const OVERRIDE { return 0; } 34 virtual uint32_t GetHandle() const override { return 0; }
35 virtual gfx::Size GetSize() const OVERRIDE { return size_; } 35 virtual gfx::Size GetSize() const override { return size_; }
36 36
37 private: 37 private:
38 virtual ~MockScanoutBuffer() {} 38 virtual ~MockScanoutBuffer() {}
39 39
40 gfx::Size size_; 40 gfx::Size size_;
41 41
42 DISALLOW_COPY_AND_ASSIGN(MockScanoutBuffer); 42 DISALLOW_COPY_AND_ASSIGN(MockScanoutBuffer);
43 }; 43 };
44 44
45 } // namespace 45 } // namespace
46 46
47 class HardwareDisplayControllerTest : public testing::Test { 47 class HardwareDisplayControllerTest : public testing::Test {
48 public: 48 public:
49 HardwareDisplayControllerTest() {} 49 HardwareDisplayControllerTest() {}
50 virtual ~HardwareDisplayControllerTest() {} 50 virtual ~HardwareDisplayControllerTest() {}
51 51
52 virtual void SetUp() OVERRIDE; 52 virtual void SetUp() override;
53 virtual void TearDown() OVERRIDE; 53 virtual void TearDown() override;
54 protected: 54 protected:
55 scoped_ptr<ui::HardwareDisplayController> controller_; 55 scoped_ptr<ui::HardwareDisplayController> controller_;
56 scoped_ptr<ui::MockDriWrapper> drm_; 56 scoped_ptr<ui::MockDriWrapper> drm_;
57 57
58 private: 58 private:
59 DISALLOW_COPY_AND_ASSIGN(HardwareDisplayControllerTest); 59 DISALLOW_COPY_AND_ASSIGN(HardwareDisplayControllerTest);
60 }; 60 };
61 61
62 void HardwareDisplayControllerTest::SetUp() { 62 void HardwareDisplayControllerTest::SetUp() {
63 drm_.reset(new ui::MockDriWrapper(3)); 63 drm_.reset(new ui::MockDriWrapper(3));
(...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 new MockScanoutBuffer(kDefaultModeSize))); 176 new MockScanoutBuffer(kDefaultModeSize)));
177 EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode)); 177 EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode));
178 EXPECT_EQ(2, drm_->get_set_crtc_call_count()); 178 EXPECT_EQ(2, drm_->get_set_crtc_call_count());
179 179
180 ui::OverlayPlane plane2(scoped_refptr<ui::ScanoutBuffer>( 180 ui::OverlayPlane plane2(scoped_refptr<ui::ScanoutBuffer>(
181 new MockScanoutBuffer(kDefaultModeSize))); 181 new MockScanoutBuffer(kDefaultModeSize)));
182 controller_->QueueOverlayPlane(plane2); 182 controller_->QueueOverlayPlane(plane2);
183 EXPECT_TRUE(controller_->SchedulePageFlip()); 183 EXPECT_TRUE(controller_->SchedulePageFlip());
184 EXPECT_EQ(2, drm_->get_page_flip_call_count()); 184 EXPECT_EQ(2, drm_->get_page_flip_call_count());
185 } 185 }
OLDNEW
« no previous file with comments | « ui/ozone/platform/dri/gbm_surfaceless.h ('k') | ui/ozone/platform/dri/native_display_delegate_dri.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698