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

Unified Diff: ui/ozone/platform/drm/gpu/drm_device.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_device.h ('k') | ui/ozone/platform/drm/gpu/drm_display.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gpu/drm_device.cc
diff --git a/ui/ozone/platform/drm/gpu/drm_device.cc b/ui/ozone/platform/drm/gpu/drm_device.cc
index 03ac08417b654c485fa12c3dcd8168074ce09862..bcb6703bb87cef9e13e07cebd7e1a5356eee47c3 100644
--- a/ui/ozone/platform/drm/gpu/drm_device.cc
+++ b/ui/ozone/platform/drm/gpu/drm_device.cc
@@ -183,7 +183,7 @@ using ScopedDrmColorLutPtr = std::unique_ptr<DrmColorLut, base::FreeDeleter>;
using ScopedDrmColorCtmPtr = std::unique_ptr<DrmColorCtm, base::FreeDeleter>;
ScopedDrmColorLutPtr CreateLutBlob(
- const std::vector<GammaRampRGBEntry>& source) {
+ const std::vector<display::GammaRampRGBEntry>& source) {
TRACE_EVENT0("drm", "CreateLutBlob");
if (source.empty())
return nullptr;
@@ -251,17 +251,17 @@ bool SetBlobProperty(int fd,
return success;
}
-std::vector<GammaRampRGBEntry> ResampleLut(
- const std::vector<GammaRampRGBEntry>& lut_in,
+std::vector<display::GammaRampRGBEntry> ResampleLut(
+ const std::vector<display::GammaRampRGBEntry>& lut_in,
size_t desired_size) {
TRACE_EVENT1("drm", "ResampleLut", "desired_size", desired_size);
if (lut_in.empty())
- return std::vector<GammaRampRGBEntry>();
+ return std::vector<display::GammaRampRGBEntry>();
if (lut_in.size() == desired_size)
return lut_in;
- std::vector<GammaRampRGBEntry> result;
+ std::vector<display::GammaRampRGBEntry> result;
result.resize(desired_size);
for (size_t i = 0; i < desired_size; ++i) {
@@ -699,8 +699,9 @@ bool DrmDevice::DropMaster() {
return (drmDropMaster(file_.GetPlatformFile()) == 0);
}
-bool DrmDevice::SetGammaRamp(uint32_t crtc_id,
- const std::vector<GammaRampRGBEntry>& lut) {
+bool DrmDevice::SetGammaRamp(
+ uint32_t crtc_id,
+ const std::vector<display::GammaRampRGBEntry>& lut) {
ScopedDrmCrtcPtr crtc = GetCrtc(crtc_id);
size_t gamma_size = static_cast<size_t>(crtc->gamma_size);
@@ -749,8 +750,8 @@ bool DrmDevice::SetGammaRamp(uint32_t crtc_id,
bool DrmDevice::SetColorCorrection(
uint32_t crtc_id,
- const std::vector<GammaRampRGBEntry>& degamma_lut,
- const std::vector<GammaRampRGBEntry>& gamma_lut,
+ const std::vector<display::GammaRampRGBEntry>& degamma_lut,
+ const std::vector<display::GammaRampRGBEntry>& gamma_lut,
const std::vector<float>& correction_matrix) {
ScopedDrmObjectPropertyPtr crtc_props(drmModeObjectGetProperties(
file_.GetPlatformFile(), crtc_id, DRM_MODE_OBJECT_CRTC));
« no previous file with comments | « ui/ozone/platform/drm/gpu/drm_device.h ('k') | ui/ozone/platform/drm/gpu/drm_display.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698