| 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 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 screen_manager_.reset(new ui::ScreenManager(buffer_generator_.get())); | 79 screen_manager_.reset(new ui::ScreenManager(buffer_generator_.get())); |
| 80 screen_manager_->AddDisplayController(drm_, kDefaultCrtc, kDefaultConnector); | 80 screen_manager_->AddDisplayController(drm_, kDefaultCrtc, kDefaultConnector); |
| 81 screen_manager_->ConfigureDisplayController( | 81 screen_manager_->ConfigureDisplayController( |
| 82 drm_, kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode); | 82 drm_, kDefaultCrtc, kDefaultConnector, gfx::Point(), kDefaultMode); |
| 83 | 83 |
| 84 drm_device_manager_.reset(new ui::DrmDeviceManager(nullptr)); | 84 drm_device_manager_.reset(new ui::DrmDeviceManager(nullptr)); |
| 85 | 85 |
| 86 scoped_ptr<ui::DrmWindow> window(new ui::DrmWindow( | 86 scoped_ptr<ui::DrmWindow> window(new ui::DrmWindow( |
| 87 kDefaultWidgetHandle, drm_device_manager_.get(), screen_manager_.get())); | 87 kDefaultWidgetHandle, drm_device_manager_.get(), screen_manager_.get())); |
| 88 window->Initialize(); | 88 window->Initialize(); |
| 89 window->OnBoundsChanged( | 89 window->SetBounds( |
| 90 gfx::Rect(gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay))); | 90 gfx::Rect(gfx::Size(kDefaultMode.hdisplay, kDefaultMode.vdisplay))); |
| 91 screen_manager_->AddWindow(kDefaultWidgetHandle, window.Pass()); | 91 screen_manager_->AddWindow(kDefaultWidgetHandle, window.Pass()); |
| 92 } | 92 } |
| 93 | 93 |
| 94 void DrmWindowTest::TearDown() { | 94 void DrmWindowTest::TearDown() { |
| 95 scoped_ptr<ui::DrmWindow> window = | 95 scoped_ptr<ui::DrmWindow> window = |
| 96 screen_manager_->RemoveWindow(kDefaultWidgetHandle); | 96 screen_manager_->RemoveWindow(kDefaultWidgetHandle); |
| 97 window->Shutdown(); | 97 window->Shutdown(); |
| 98 message_loop_.reset(); | 98 message_loop_.reset(); |
| 99 } | 99 } |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 132 | 132 |
| 133 // Add another device. | 133 // Add another device. |
| 134 scoped_refptr<ui::MockDrmDevice> drm = new ui::MockDrmDevice(); | 134 scoped_refptr<ui::MockDrmDevice> drm = new ui::MockDrmDevice(); |
| 135 screen_manager_->AddDisplayController(drm, kDefaultCrtc, kDefaultConnector); | 135 screen_manager_->AddDisplayController(drm, kDefaultCrtc, kDefaultConnector); |
| 136 screen_manager_->ConfigureDisplayController( | 136 screen_manager_->ConfigureDisplayController( |
| 137 drm, kDefaultCrtc, kDefaultConnector, | 137 drm, kDefaultCrtc, kDefaultConnector, |
| 138 gfx::Point(0, kDefaultMode.vdisplay), kDefaultMode); | 138 gfx::Point(0, kDefaultMode.vdisplay), kDefaultMode); |
| 139 | 139 |
| 140 // Move window to the display on the new device. | 140 // Move window to the display on the new device. |
| 141 screen_manager_->GetWindow(kDefaultWidgetHandle) | 141 screen_manager_->GetWindow(kDefaultWidgetHandle) |
| 142 ->OnBoundsChanged(gfx::Rect(0, kDefaultMode.vdisplay, | 142 ->SetBounds(gfx::Rect(0, kDefaultMode.vdisplay, kDefaultMode.hdisplay, |
| 143 kDefaultMode.hdisplay, | 143 kDefaultMode.vdisplay)); |
| 144 kDefaultMode.vdisplay)); | |
| 145 | 144 |
| 146 EXPECT_EQ(2u, GetCursorBuffers(drm).size()); | 145 EXPECT_EQ(2u, GetCursorBuffers(drm).size()); |
| 147 // Make sure the cursor is showing on the new display. | 146 // Make sure the cursor is showing on the new display. |
| 148 EXPECT_NE(0u, drm->get_cursor_handle_for_crtc(kDefaultCrtc)); | 147 EXPECT_NE(0u, drm->get_cursor_handle_for_crtc(kDefaultCrtc)); |
| 149 } | 148 } |
| OLD | NEW |