Manual Merge 201756 "Changes how to compute the id of a display." (2nd)

ui/gfx/display.cc

 // Copyright (c) 2012 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/gfx/display.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/stringprintf.h"
@@ skipping 36 matching lines @@
   return kForcedDeviceScaleFactor;
 }
 
 //static
 bool Display::HasForceDeviceScaleFactor() {
   return HasForceDeviceScaleFactorImpl();
 }
 
 // static
 int64 Display::GetID(uint16 manufacturer_id,
-                     uint16 product_code,
+                     uint32 product_code_hash,
                      uint8 output_index) {
-  int64 new_id = ((static_cast<int64>(manufacturer_id) << 24) |
-                  (static_cast<int64>(product_code) << 8) | output_index);
+  int64 new_id = ((static_cast<int64>(manufacturer_id) << 40) |
+                  (static_cast<int64>(product_code_hash) << 8) | output_index);
   DCHECK_NE(kInvalidDisplayID, new_id);
   return new_id;
 }
 
 Display::Display()
     : id_(kInvalidDisplayID),
       device_scale_factor_(GetForcedDeviceScaleFactor()),
       rotation_(ROTATE_0) {
 }
 
@@ skipping 80 matching lines @@
 
 int64 Display::InternalDisplayId() {
   return internal_display_id_;
 }
 
 void Display::SetInternalDisplayId(int64 internal_display_id) {
   internal_display_id_ = internal_display_id;
 }
 
 }  // namespace gfx