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

Unified Diff: ui/ozone/platform/dri/hardware_display_controller.cc

Issue 908993003: [Ozone-Dri] Rename DriWrapper to DrmDevice (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@udl3-pass-drm-fd
Patch Set: rebased Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: ui/ozone/platform/dri/hardware_display_controller.cc
diff --git a/ui/ozone/platform/dri/hardware_display_controller.cc b/ui/ozone/platform/dri/hardware_display_controller.cc
index faee6e616e2d164ed3962763d8fb18ae2a8902c7..061506739966078d78a4304f0672288bc32f2e83 100644
--- a/ui/ozone/platform/dri/hardware_display_controller.cc
+++ b/ui/ozone/platform/dri/hardware_display_controller.cc
@@ -17,7 +17,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/ozone/platform/dri/crtc_controller.h"
#include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/dri_wrapper.h"
+#include "ui/ozone/platform/dri/drm_device.h"
#include "ui/ozone/public/native_pixmap.h"
namespace ui {
@@ -157,7 +157,7 @@ void HardwareDisplayController::AddCrtc(scoped_ptr<CrtcController> controller) {
}
scoped_ptr<CrtcController> HardwareDisplayController::RemoveCrtc(
- const scoped_refptr<DriWrapper>& drm,
+ const scoped_refptr<DrmDevice>& drm,
uint32_t crtc) {
for (ScopedVector<CrtcController>::iterator it = crtc_controllers_.begin();
it != crtc_controllers_.end(); ++it) {
@@ -191,7 +191,7 @@ scoped_ptr<CrtcController> HardwareDisplayController::RemoveCrtc(
return nullptr;
}
-bool HardwareDisplayController::HasCrtc(const scoped_refptr<DriWrapper>& drm,
+bool HardwareDisplayController::HasCrtc(const scoped_refptr<DrmDevice>& drm,
uint32_t crtc) const {
for (size_t i = 0; i < crtc_controllers_.size(); ++i)
if (crtc_controllers_[i]->drm() == drm &&
@@ -260,7 +260,7 @@ void HardwareDisplayController::OnPageFlipEvent() {
}
}
-scoped_refptr<DriWrapper> HardwareDisplayController::GetAllocationDriWrapper()
+scoped_refptr<DrmDevice> HardwareDisplayController::GetAllocationDrmDevice()
const {
DCHECK(!crtc_controllers_.empty());
// TODO(dnicoara) When we support mirroring across DRM devices, figure out
« no previous file with comments | « ui/ozone/platform/dri/hardware_display_controller.h ('k') | ui/ozone/platform/dri/hardware_display_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698