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

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

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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 "ui/ozone/platform/drm/gpu/drm_window.h"
6
5 #include <stdint.h> 7 #include <stdint.h>
6 8
9 #include <memory>
7 #include <utility> 10 #include <utility>
8 #include <vector> 11 #include <vector>
9 12
10 #include "base/macros.h" 13 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/message_loop/message_loop.h" 14 #include "base/message_loop/message_loop.h"
13 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
14 #include "third_party/skia/include/core/SkCanvas.h" 16 #include "third_party/skia/include/core/SkCanvas.h"
15 #include "third_party/skia/include/core/SkColor.h" 17 #include "third_party/skia/include/core/SkColor.h"
16 #include "third_party/skia/include/core/SkImageInfo.h" 18 #include "third_party/skia/include/core/SkImageInfo.h"
17 #include "ui/ozone/platform/drm/gpu/drm_device_generator.h" 19 #include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
18 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h" 20 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
19 #include "ui/ozone/platform/drm/gpu/drm_window.h"
20 #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h" 21 #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
21 #include "ui/ozone/platform/drm/gpu/mock_drm_device.h" 22 #include "ui/ozone/platform/drm/gpu/mock_drm_device.h"
22 #include "ui/ozone/platform/drm/gpu/mock_dumb_buffer_generator.h" 23 #include "ui/ozone/platform/drm/gpu/mock_dumb_buffer_generator.h"
23 #include "ui/ozone/platform/drm/gpu/screen_manager.h" 24 #include "ui/ozone/platform/drm/gpu/screen_manager.h"
24 #include "ui/ozone/public/surface_ozone_canvas.h" 25 #include "ui/ozone/public/surface_ozone_canvas.h"
25 26
26 namespace { 27 namespace {
27 28
28 // Mode of size 6x4. 29 // Mode of size 6x4.
29 const drmModeModeInfo kDefaultMode = 30 const drmModeModeInfo kDefaultMode =
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 65
65 void SetUp() override; 66 void SetUp() override;
66 void TearDown() override; 67 void TearDown() override;
67 68
68 void OnSwapBuffers(gfx::SwapResult result) { 69 void OnSwapBuffers(gfx::SwapResult result) {
69 on_swap_buffers_count_++; 70 on_swap_buffers_count_++;
70 last_swap_buffers_result_ = result; 71 last_swap_buffers_result_ = result;
71 } 72 }
72 73
73 protected: 74 protected:
74 scoped_ptr<base::MessageLoop> message_loop_; 75 std::unique_ptr<base::MessageLoop> message_loop_;
75 scoped_refptr<ui::MockDrmDevice> drm_; 76 scoped_refptr<ui::MockDrmDevice> drm_;
76 scoped_ptr<ui::MockDumbBufferGenerator> buffer_generator_; 77 std::unique_ptr<ui::MockDumbBufferGenerator> buffer_generator_;
77 scoped_ptr<ui::ScreenManager> screen_manager_; 78 std::unique_ptr<ui::ScreenManager> screen_manager_;
78 scoped_ptr<ui::DrmDeviceManager> drm_device_manager_; 79 std::unique_ptr<ui::DrmDeviceManager> drm_device_manager_;
79 80
80 int on_swap_buffers_count_; 81 int on_swap_buffers_count_;
81 gfx::SwapResult last_swap_buffers_result_; 82 gfx::SwapResult last_swap_buffers_result_;
82 83
83 private: 84 private:
84 DISALLOW_COPY_AND_ASSIGN(DrmWindowTest); 85 DISALLOW_COPY_AND_ASSIGN(DrmWindowTest);
85 }; 86 };
86 87
87 void DrmWindowTest::SetUp() { 88 void DrmWindowTest::SetUp() {
88 on_swap_buffers_count_ = 0; 89 on_swap_buffers_count_ = 0;
89 last_swap_buffers_result_ = gfx::SwapResult::SWAP_FAILED; 90 last_swap_buffers_result_ = gfx::SwapResult::SWAP_FAILED;
90 91
91 message_loop_.reset(new base::MessageLoopForUI); 92 message_loop_.reset(new base::MessageLoopForUI);
92 drm_ = new ui::MockDrmDevice(); 93 drm_ = new ui::MockDrmDevice();
93 buffer_generator_.reset(new ui::MockDumbBufferGenerator()); 94 buffer_generator_.reset(new ui::MockDumbBufferGenerator());
94 screen_manager_.reset(new ui::ScreenManager(buffer_generator_.get())); 95 screen_manager_.reset(new ui::ScreenManager(buffer_generator_.get()));
95 screen_manager_->AddDisplayController(drm_, kDefaultCrtc, kDefaultConnector); 96 screen_manager_->AddDisplayController(drm_, kDefaultCrtc, kDefaultConnector);
96 screen_manager_->ConfigureDisplayController( 97 screen_manager_->ConfigureDisplayController(
97 drm_, kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode); 98 drm_, kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode);
98 99
99 drm_device_manager_.reset(new ui::DrmDeviceManager(nullptr)); 100 drm_device_manager_.reset(new ui::DrmDeviceManager(nullptr));
100 101
101 scoped_ptr<ui::DrmWindow> window(new ui::DrmWindow( 102 std::unique_ptr<ui::DrmWindow> window(new ui::DrmWindow(
102 kDefaultWidgetHandle, drm_device_manager_.get(), screen_manager_.get())); 103 kDefaultWidgetHandle, drm_device_manager_.get(), screen_manager_.get()));
103 window->Initialize(buffer_generator_.get()); 104 window->Initialize(buffer_generator_.get());
104 window->SetBounds( 105 window->SetBounds(
105 gfx::Rect(gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay))); 106 gfx::Rect(gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay)));
106 screen_manager_->AddWindow(kDefaultWidgetHandle, std::move(window)); 107 screen_manager_->AddWindow(kDefaultWidgetHandle, std::move(window));
107 } 108 }
108 109
109 void DrmWindowTest::TearDown() { 110 void DrmWindowTest::TearDown() {
110 scoped_ptr<ui::DrmWindow> window = 111 std::unique_ptr<ui::DrmWindow> window =
111 screen_manager_->RemoveWindow(kDefaultWidgetHandle); 112 screen_manager_->RemoveWindow(kDefaultWidgetHandle);
112 window->Shutdown(); 113 window->Shutdown();
113 message_loop_.reset(); 114 message_loop_.reset();
114 } 115 }
115 116
116 TEST_F(DrmWindowTest, SetCursorImage) { 117 TEST_F(DrmWindowTest, SetCursorImage) {
117 const gfx::Size cursor_size(6, 4); 118 const gfx::Size cursor_size(6, 4);
118 screen_manager_->GetWindow(kDefaultWidgetHandle) 119 screen_manager_->GetWindow(kDefaultWidgetHandle)
119 ->SetCursor(std::vector<SkBitmap>(1, AllocateBitmap(cursor_size)), 120 ->SetCursor(std::vector<SkBitmap>(1, AllocateBitmap(cursor_size)),
120 gfx::Point(4, 2), 0); 121 gfx::Point(4, 2), 0);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 EXPECT_EQ(1, on_swap_buffers_count_); 179 EXPECT_EQ(1, on_swap_buffers_count_);
179 EXPECT_EQ(gfx::SwapResult::SWAP_NAK_RECREATE_BUFFERS, 180 EXPECT_EQ(gfx::SwapResult::SWAP_NAK_RECREATE_BUFFERS,
180 last_swap_buffers_result_); 181 last_swap_buffers_result_);
181 182
182 window->SchedulePageFlip( 183 window->SchedulePageFlip(
183 std::vector<ui::OverlayPlane>(1, ui::OverlayPlane(plane)), 184 std::vector<ui::OverlayPlane>(1, ui::OverlayPlane(plane)),
184 base::Bind(&DrmWindowTest::OnSwapBuffers, base::Unretained(this))); 185 base::Bind(&DrmWindowTest::OnSwapBuffers, base::Unretained(this)));
185 EXPECT_EQ(2, on_swap_buffers_count_); 186 EXPECT_EQ(2, on_swap_buffers_count_);
186 EXPECT_EQ(gfx::SwapResult::SWAP_FAILED, last_swap_buffers_result_); 187 EXPECT_EQ(gfx::SwapResult::SWAP_FAILED, last_swap_buffers_result_);
187 } 188 }
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_window.cc ('k') | ui/ozone/platform/drm/gpu/gbm_surface_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698