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

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

Issue 667753002: Treat displays with and without EDID the same way (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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/common/gpu/ozone_gpu_messages.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/dri/display_snapshot_dri.cc
diff --git a/ui/ozone/platform/dri/display_snapshot_dri.cc b/ui/ozone/platform/dri/display_snapshot_dri.cc
index 0d0c55918befcce9d704236702067a2e1323f830..383f94934a7fc3267f62238d74711c441091cef7 100644
--- a/ui/ozone/platform/dri/display_snapshot_dri.cc
+++ b/ui/ozone/platform/dri/display_snapshot_dri.cc
@@ -67,7 +67,6 @@ DisplaySnapshotDri::DisplaySnapshotDri(DriWrapper* drm,
drmModeCrtc* crtc,
uint32_t index)
: DisplaySnapshot(index,
- false,
gfx::Point(crtc->x, crtc->y),
gfx::Size(connector->mmWidth, connector->mmHeight),
GetDisplayType(connector),
@@ -91,7 +90,9 @@ DisplaySnapshotDri::DisplaySnapshotDri(DriWrapper* drm,
static_cast<uint8_t*>(edid_blob->data),
static_cast<uint8_t*>(edid_blob->data) + edid_blob->length);
- has_proper_display_id_ = GetDisplayIdFromEDID(edid, index, &display_id_);
+ if (!GetDisplayIdFromEDID(edid, index, &display_id_))
+ display_id_ = index;
+
ParseOutputDeviceData(edid, NULL, &display_name_);
ParseOutputOverscanFlag(edid, &overscan_flag_);
} else {
« no previous file with comments | « ui/ozone/common/gpu/ozone_gpu_messages.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698