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

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

Issue 2613493002: Fix namespace for src/ui/display/. (Closed)
Patch Set: Rebase. Created 3 years, 11 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_gpu_display_manager.h" 5 #include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include "base/memory/ptr_util.h" 9 #include "base/memory/ptr_util.h"
10 #include "ui/display/types/gamma_ramp_rgb_entry.h" 10 #include "ui/display/types/gamma_ramp_rgb_entry.h"
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 bool DrmGpuDisplayManager::DisableDisplay(int64_t display_id) { 167 bool DrmGpuDisplayManager::DisableDisplay(int64_t display_id) {
168 DrmDisplay* display = FindDisplay(display_id); 168 DrmDisplay* display = FindDisplay(display_id);
169 if (!display) { 169 if (!display) {
170 LOG(ERROR) << "There is no display with ID " << display_id; 170 LOG(ERROR) << "There is no display with ID " << display_id;
171 return false; 171 return false;
172 } 172 }
173 173
174 return display->Configure(nullptr, gfx::Point()); 174 return display->Configure(nullptr, gfx::Point());
175 } 175 }
176 176
177 bool DrmGpuDisplayManager::GetHDCPState(int64_t display_id, HDCPState* state) { 177 bool DrmGpuDisplayManager::GetHDCPState(int64_t display_id,
178 display::HDCPState* state) {
178 DrmDisplay* display = FindDisplay(display_id); 179 DrmDisplay* display = FindDisplay(display_id);
179 if (!display) { 180 if (!display) {
180 LOG(ERROR) << "There is no display with ID " << display_id; 181 LOG(ERROR) << "There is no display with ID " << display_id;
181 return false; 182 return false;
182 } 183 }
183 184
184 return display->GetHDCPState(state); 185 return display->GetHDCPState(state);
185 } 186 }
186 187
187 bool DrmGpuDisplayManager::SetHDCPState(int64_t display_id, HDCPState state) { 188 bool DrmGpuDisplayManager::SetHDCPState(int64_t display_id,
189 display::HDCPState state) {
188 DrmDisplay* display = FindDisplay(display_id); 190 DrmDisplay* display = FindDisplay(display_id);
189 if (!display) { 191 if (!display) {
190 LOG(ERROR) << "There is no display with ID " << display_id; 192 LOG(ERROR) << "There is no display with ID " << display_id;
191 return false; 193 return false;
192 } 194 }
193 195
194 return display->SetHDCPState(state); 196 return display->SetHDCPState(state);
195 } 197 }
196 198
197 void DrmGpuDisplayManager::SetColorCorrection( 199 void DrmGpuDisplayManager::SetColorCorrection(
198 int64_t display_id, 200 int64_t display_id,
199 const std::vector<GammaRampRGBEntry>& degamma_lut, 201 const std::vector<display::GammaRampRGBEntry>& degamma_lut,
200 const std::vector<GammaRampRGBEntry>& gamma_lut, 202 const std::vector<display::GammaRampRGBEntry>& gamma_lut,
201 const std::vector<float>& correction_matrix) { 203 const std::vector<float>& correction_matrix) {
202 DrmDisplay* display = FindDisplay(display_id); 204 DrmDisplay* display = FindDisplay(display_id);
203 if (!display) { 205 if (!display) {
204 LOG(ERROR) << "There is no display with ID " << display_id; 206 LOG(ERROR) << "There is no display with ID " << display_id;
205 return; 207 return;
206 } 208 }
207 209
208 display->SetColorCorrection(degamma_lut, gamma_lut, correction_matrix); 210 display->SetColorCorrection(degamma_lut, gamma_lut, correction_matrix);
209 } 211 }
210 212
(...skipping 24 matching lines...) Expand all
235 DisplayComparator(new_display.get())); 237 DisplayComparator(new_display.get()));
236 238
237 if (it == old_displays.end()) { 239 if (it == old_displays.end()) {
238 screen_manager_->AddDisplayController( 240 screen_manager_->AddDisplayController(
239 new_display->drm(), new_display->crtc(), new_display->connector()); 241 new_display->drm(), new_display->crtc(), new_display->connector());
240 } 242 }
241 } 243 }
242 } 244 }
243 245
244 } // namespace ui 246 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h ('k') | ui/ozone/platform/drm/gpu/drm_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698