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

Side by Side Diff: ui/ozone/platform/dri/dri_surface_factory_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 <vector> 5 #include <vector>
6 6
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "third_party/skia/include/core/SkCanvas.h" 10 #include "third_party/skia/include/core/SkCanvas.h"
(...skipping 22 matching lines...) Expand all
33 class MockScreenManager : public ui::ScreenManager { 33 class MockScreenManager : public ui::ScreenManager {
34 public: 34 public:
35 MockScreenManager(ui::DriWrapper* dri, 35 MockScreenManager(ui::DriWrapper* dri,
36 ui::ScanoutBufferGenerator* buffer_generator) 36 ui::ScanoutBufferGenerator* buffer_generator)
37 : ScreenManager(dri, buffer_generator), 37 : ScreenManager(dri, buffer_generator),
38 dri_(dri) {} 38 dri_(dri) {}
39 virtual ~MockScreenManager() {} 39 virtual ~MockScreenManager() {}
40 40
41 // Normally we'd use DRM to figure out the controller configuration. But we 41 // Normally we'd use DRM to figure out the controller configuration. But we
42 // can't use DRM in unit tests, so we just create a fake configuration. 42 // can't use DRM in unit tests, so we just create a fake configuration.
43 virtual void ForceInitializationOfPrimaryDisplay() OVERRIDE { 43 virtual void ForceInitializationOfPrimaryDisplay() override {
44 ConfigureDisplayController( 44 ConfigureDisplayController(
45 kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode); 45 kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode);
46 } 46 }
47 47
48 private: 48 private:
49 ui::DriWrapper* dri_; // Not owned. 49 ui::DriWrapper* dri_; // Not owned.
50 50
51 DISALLOW_COPY_AND_ASSIGN(MockScreenManager); 51 DISALLOW_COPY_AND_ASSIGN(MockScreenManager);
52 }; 52 };
53 53
54 } // namespace 54 } // namespace
55 55
56 class DriSurfaceFactoryTest : public testing::Test { 56 class DriSurfaceFactoryTest : public testing::Test {
57 public: 57 public:
58 DriSurfaceFactoryTest() {} 58 DriSurfaceFactoryTest() {}
59 59
60 virtual void SetUp() OVERRIDE; 60 virtual void SetUp() override;
61 virtual void TearDown() OVERRIDE; 61 virtual void TearDown() override;
62 protected: 62 protected:
63 scoped_ptr<base::MessageLoop> message_loop_; 63 scoped_ptr<base::MessageLoop> message_loop_;
64 scoped_ptr<ui::MockDriWrapper> dri_; 64 scoped_ptr<ui::MockDriWrapper> dri_;
65 scoped_ptr<ui::DriBufferGenerator> buffer_generator_; 65 scoped_ptr<ui::DriBufferGenerator> buffer_generator_;
66 scoped_ptr<MockScreenManager> screen_manager_; 66 scoped_ptr<MockScreenManager> screen_manager_;
67 scoped_ptr<ui::DriSurfaceFactory> factory_; 67 scoped_ptr<ui::DriSurfaceFactory> factory_;
68 scoped_ptr<ui::DriWindowDelegateManager> window_delegate_manager_; 68 scoped_ptr<ui::DriWindowDelegateManager> window_delegate_manager_;
69 69
70 private: 70 private:
71 DISALLOW_COPY_AND_ASSIGN(DriSurfaceFactoryTest); 71 DISALLOW_COPY_AND_ASSIGN(DriSurfaceFactoryTest);
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 for (int i = 0; i < cursor.height(); ++i) { 146 for (int i = 0; i < cursor.height(); ++i) {
147 for (int j = 0; j < cursor.width(); ++j) { 147 for (int j = 0; j < cursor.width(); ++j) {
148 if (j < info.width() && i < info.height()) 148 if (j < info.width() && i < info.height())
149 EXPECT_EQ(SK_ColorWHITE, cursor.getColor(j, i)); 149 EXPECT_EQ(SK_ColorWHITE, cursor.getColor(j, i));
150 else 150 else
151 EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT), 151 EXPECT_EQ(static_cast<SkColor>(SK_ColorTRANSPARENT),
152 cursor.getColor(j, i)); 152 cursor.getColor(j, i));
153 } 153 }
154 } 154 }
155 } 155 }
OLDNEW
« no previous file with comments | « ui/ozone/platform/dri/dri_surface_factory.h ('k') | ui/ozone/platform/dri/dri_surface_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698