| OLD | NEW |
| 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 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 screen_manager_->ConfigureDisplayController( | 92 screen_manager_->ConfigureDisplayController( |
| 93 drm_, kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode); | 93 drm_, kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode); |
| 94 | 94 |
| 95 drm_device_manager_.reset(new ui::DrmDeviceManager(nullptr)); | 95 drm_device_manager_.reset(new ui::DrmDeviceManager(nullptr)); |
| 96 | 96 |
| 97 scoped_ptr<ui::DrmWindow> window(new ui::DrmWindow( | 97 scoped_ptr<ui::DrmWindow> window(new ui::DrmWindow( |
| 98 kDefaultWidgetHandle, drm_device_manager_.get(), screen_manager_.get())); | 98 kDefaultWidgetHandle, drm_device_manager_.get(), screen_manager_.get())); |
| 99 window->Initialize(); | 99 window->Initialize(); |
| 100 window->SetBounds( | 100 window->SetBounds( |
| 101 gfx::Rect(gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay))); | 101 gfx::Rect(gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay))); |
| 102 screen_manager_->AddWindow(kDefaultWidgetHandle, window.Pass()); | 102 screen_manager_->AddWindow(kDefaultWidgetHandle, std::move(window)); |
| 103 } | 103 } |
| 104 | 104 |
| 105 void DrmWindowTest::TearDown() { | 105 void DrmWindowTest::TearDown() { |
| 106 scoped_ptr<ui::DrmWindow> window = | 106 scoped_ptr<ui::DrmWindow> window = |
| 107 screen_manager_->RemoveWindow(kDefaultWidgetHandle); | 107 screen_manager_->RemoveWindow(kDefaultWidgetHandle); |
| 108 window->Shutdown(); | 108 window->Shutdown(); |
| 109 message_loop_.reset(); | 109 message_loop_.reset(); |
| 110 } | 110 } |
| 111 | 111 |
| 112 TEST_F(DrmWindowTest, SetCursorImage) { | 112 TEST_F(DrmWindowTest, SetCursorImage) { |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 EXPECT_EQ(1, on_swap_buffers_count_); | 174 EXPECT_EQ(1, on_swap_buffers_count_); |
| 175 EXPECT_EQ(gfx::SwapResult::SWAP_NAK_RECREATE_BUFFERS, | 175 EXPECT_EQ(gfx::SwapResult::SWAP_NAK_RECREATE_BUFFERS, |
| 176 last_swap_buffers_result_); | 176 last_swap_buffers_result_); |
| 177 | 177 |
| 178 window->SchedulePageFlip( | 178 window->SchedulePageFlip( |
| 179 std::vector<ui::OverlayPlane>(1, ui::OverlayPlane(plane)), | 179 std::vector<ui::OverlayPlane>(1, ui::OverlayPlane(plane)), |
| 180 base::Bind(&DrmWindowTest::OnSwapBuffers, base::Unretained(this))); | 180 base::Bind(&DrmWindowTest::OnSwapBuffers, base::Unretained(this))); |
| 181 EXPECT_EQ(2, on_swap_buffers_count_); | 181 EXPECT_EQ(2, on_swap_buffers_count_); |
| 182 EXPECT_EQ(gfx::SwapResult::SWAP_FAILED, last_swap_buffers_result_); | 182 EXPECT_EQ(gfx::SwapResult::SWAP_FAILED, last_swap_buffers_result_); |
| 183 } | 183 } |
| OLD | NEW |