Load ICC file for display color correction based on display product identifier

ui/display/util/edid_parser.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/display/util/edid_parser.h"
 
 #include <algorithm>
 
 #include "base/hash.h"
 #include "base/strings/string_util.h"
@@ skipping 11 matching lines @@
 // treated as swap. The 'serial number' field in EDID isn't used here because
 // it is not guaranteed to have unique number and it may have the same fixed
 // value (like 0).
 int64_t GetID(uint16_t manufacturer_id,
               uint32_t product_code_hash,
               uint8_t output_index) {
   return ((static_cast<int64_t>(manufacturer_id) << 40) |
           (static_cast<int64_t>(product_code_hash) << 8) | output_index);
 }
 
+// Returns a 64-bit identifier for this model of display, using
+// |manufacturer_id| and |product_code_hash|.
+int64_t GetProductID(uint16_t manufacturer_id, uint32_t product_code_hash) {
+  return ((static_cast<int64_t>(manufacturer_id) << 32) |
+          (static_cast<int64_t>(product_code_hash)));
+}
+
 }  // namespace
 
 bool GetDisplayIdFromEDID(const std::vector<uint8_t>& edid,
                           uint8_t output_index,
-                          int64_t* display_id_out) {
+                          int64_t* display_id_out,
+                          int64_t* product_id_out) {
   uint16_t manufacturer_id = 0;
   std::string product_name;
 
   // ParseOutputDeviceData fails if it doesn't have product_name.
   ParseOutputDeviceData(edid, &manufacturer_id, &product_name, nullptr,
                         nullptr);
 
   // Generates product specific value from product_name instead of product code.
   // See crbug.com/240341
   uint32_t product_code_hash = product_name.empty() ?
       0 : base::Hash(product_name);
   if (manufacturer_id != 0) {
     // An ID based on display's index will be assigned later if this call
     // fails.
     *display_id_out = GetID(
         manufacturer_id, product_code_hash, output_index);
+    if (product_id_out)
+      *product_id_out = GetProductID(manufacturer_id, product_code_hash);
     return true;
   }
   return false;
 }
 
 bool ParseOutputDeviceData(const std::vector<uint8_t>& edid,
                            uint16_t* manufacturer_id,
                            std::string* human_readable_name,
                            gfx::Size* active_pixel_out,
                            gfx::Size* physical_display_size_out) {
@@ skipping 175 matching lines @@
         *flag = false;
       }
       return true;
     }
   }
 
   return false;
 }
 
 }  // namespace ui