From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/display/util/edid_parser.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'chromium/ui/display/util/edid_parser.cc') diff --git a/chromium/ui/display/util/edid_parser.cc b/chromium/ui/display/util/edid_parser.cc index 4664a3e5332..d1b248b92ed 100644 --- a/chromium/ui/display/util/edid_parser.cc +++ b/chromium/ui/display/util/edid_parser.cc @@ -328,14 +328,10 @@ void EdidParser::ParseEdid(const std::vector& edid) { } // Verify if the |display_name_| consists of printable characters only. - // TODO(oshima|muka): Consider replacing unprintable chars with white space. - for (const char c : display_name_) { - if (!isascii(c) || !isprint(c)) { - display_name_.clear(); - base::UmaHistogramEnumeration(kParseEdidFailureMetric, - ParseEdidFailure::kDisplayName); - } - } + // Replace unprintable chars with white space. + std::replace_if( + display_name_.begin(), display_name_.end(), + [](char c) { return !isascii(c) || !isprint(c); }, ' '); // See http://en.wikipedia.org/wiki/Extended_display_identification_data // for the extension format of EDID. Also see EIA/CEA-861 spec for -- cgit v1.2.1