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

Unified Diff: ui/ozone/platform/drm/gpu/drm_gpu_platform_support.cc

Issue 1146493004: ozone: drm: Rename ndd_ member to display_manager_ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gpu/drm_gpu_platform_support.cc
diff --git a/ui/ozone/platform/drm/gpu/drm_gpu_platform_support.cc b/ui/ozone/platform/drm/gpu/drm_gpu_platform_support.cc
index b6118a5097e104dc596c23510fa9c15f2d78db72..45c57313aae597a6135b84f582a63ec8956fd0f5 100644
--- a/ui/ozone/platform/drm/gpu/drm_gpu_platform_support.cc
+++ b/ui/ozone/platform/drm/gpu/drm_gpu_platform_support.cc
@@ -175,11 +175,11 @@ class DrmGpuPlatformSupportMessageFilter : public IPC::MessageFilter {
DrmGpuPlatformSupport::DrmGpuPlatformSupport(
DrmDeviceManager* drm_device_manager,
ScreenManager* screen_manager,
- scoped_ptr<DrmGpuDisplayManager> ndd)
+ scoped_ptr<DrmGpuDisplayManager> display_manager)
: sender_(NULL),
drm_device_manager_(drm_device_manager),
screen_manager_(screen_manager),
- ndd_(ndd.Pass()) {
+ display_manager_(display_manager.Pass()) {
filter_ = new DrmGpuPlatformSupportMessageFilter(
screen_manager, base::Bind(&DrmGpuPlatformSupport::SetIOTaskRunner,
base::Unretained(this)),
@@ -270,7 +270,8 @@ void DrmGpuPlatformSupport::OnCursorMove(gfx::AcceleratedWidget widget,
}
void DrmGpuPlatformSupport::OnRefreshNativeDisplays() {
- sender_->Send(new OzoneHostMsg_UpdateNativeDisplays(ndd_->GetDisplays()));
+ sender_->Send(
+ new OzoneHostMsg_UpdateNativeDisplays(display_manager_->GetDisplays()));
}
void DrmGpuPlatformSupport::OnConfigureNativeDisplay(
@@ -278,20 +279,20 @@ void DrmGpuPlatformSupport::OnConfigureNativeDisplay(
const DisplayMode_Params& mode_param,
const gfx::Point& origin) {
sender_->Send(new OzoneHostMsg_DisplayConfigured(
- id, ndd_->ConfigureDisplay(id, mode_param, origin)));
+ id, display_manager_->ConfigureDisplay(id, mode_param, origin)));
}
void DrmGpuPlatformSupport::OnDisableNativeDisplay(int64_t id) {
- sender_->Send(
- new OzoneHostMsg_DisplayConfigured(id, ndd_->DisableDisplay(id)));
+ sender_->Send(new OzoneHostMsg_DisplayConfigured(
+ id, display_manager_->DisableDisplay(id)));
}
void DrmGpuPlatformSupport::OnTakeDisplayControl() {
- ndd_->TakeDisplayControl();
+ display_manager_->TakeDisplayControl();
}
void DrmGpuPlatformSupport::OnRelinquishDisplayControl() {
- ndd_->RelinquishDisplayControl();
+ display_manager_->RelinquishDisplayControl();
}
void DrmGpuPlatformSupport::OnAddGraphicsDevice(
@@ -307,7 +308,7 @@ void DrmGpuPlatformSupport::OnRemoveGraphicsDevice(const base::FilePath& path) {
void DrmGpuPlatformSupport::OnSetGammaRamp(
int64_t id,
const std::vector<GammaRampRGBEntry>& lut) {
- ndd_->SetGammaRamp(id, lut);
+ display_manager_->SetGammaRamp(id, lut);
}
void DrmGpuPlatformSupport::RelinquishGpuResources(
@@ -317,14 +318,14 @@ void DrmGpuPlatformSupport::RelinquishGpuResources(
void DrmGpuPlatformSupport::OnGetHDCPState(int64_t display_id) {
HDCPState state = HDCP_STATE_UNDESIRED;
- bool success = ndd_->GetHDCPState(display_id, &state);
+ bool success = display_manager_->GetHDCPState(display_id, &state);
sender_->Send(new OzoneHostMsg_HDCPStateReceived(display_id, success, state));
}
void DrmGpuPlatformSupport::OnSetHDCPState(int64_t display_id,
HDCPState state) {
sender_->Send(new OzoneHostMsg_HDCPStateUpdated(
- display_id, ndd_->SetHDCPState(display_id, state)));
+ display_id, display_manager_->SetHDCPState(display_id, state)));
}
void DrmGpuPlatformSupport::SetIOTaskRunner(
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698