Make DisplayInfo::Copy() copy over DisplayInfo::is_aspect_preserving_scaling_

ash/display/display_info.cc

 // Copyright (c) 2013 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 <stdio.h>
 #include <string>
 #include <vector>
 
 #include "ash/display/display_info.h"
 #include "base/logging.h"
@@ skipping 248 matching lines @@
 }
 
 DisplayInfo::~DisplayInfo() {
 }
 
 void DisplayInfo::Copy(const DisplayInfo& native_info) {
   DCHECK(id_ == native_info.id_);
   name_ = native_info.name_;
   has_overscan_ = native_info.has_overscan_;
 
+  touch_support_ = native_info.touch_support_;
+  touch_device_id_ = native_info.touch_device_id_;
+  device_scale_factor_ = native_info.device_scale_factor_;
   DCHECK(!native_info.bounds_in_native_.IsEmpty());
   bounds_in_native_ = native_info.bounds_in_native_;
   size_in_pixel_ = native_info.size_in_pixel_;
-  device_scale_factor_ = native_info.device_scale_factor_;
+  is_aspect_preserving_scaling_ = native_info.is_aspect_preserving_scaling_;
   display_modes_ = native_info.display_modes_;
-  touch_support_ = native_info.touch_support_;
-  touch_device_id_ = native_info.touch_device_id_;
+  available_color_profiles_ = native_info.available_color_profiles_;

[pkotwicz, 2015/01/29 20:37:59]

I reordered these to match the order in the .h file

 
   // Rotation, ui_scale, color_profile and overscan are given by preference,
   // or unit tests. Don't copy if this native_info came from
   // DisplayChangeObserver.
   if (!native_info.native()) {
     // Update the overscan_insets_in_dip_ either if the inset should be
     // cleared, or has non empty insts.
     if (native_info.clear_overscan_insets())
       overscan_insets_in_dip_.Set(0, 0, 0, 0);
     else if (!native_info.overscan_insets_in_dip_.empty())
       overscan_insets_in_dip_ = native_info.overscan_insets_in_dip_;
 
     rotation_ = native_info.rotation_;
     configured_ui_scale_ = native_info.configured_ui_scale_;
     color_profile_ = native_info.color_profile();
   }
-
-  available_color_profiles_ = native_info.available_color_profiles();
-
-  // Don't copy insets as it may be given by preference.  |rotation_|
-  // is treated as a native so that it can be specified in
-  // |CreateFromSpec|.
 }
 
 void DisplayInfo::SetBounds(const gfx::Rect& new_bounds_in_native) {
   bounds_in_native_ = new_bounds_in_native;
   size_in_pixel_ = new_bounds_in_native.size();
   UpdateDisplaySize();
 }
 
 float DisplayInfo::GetEffectiveDeviceScaleFactor() const {
   if (Use125DSFRorUIScaling() && device_scale_factor_ == 1.25f)
@@ skipping 101 matching lines @@
   return std::find(available_color_profiles_.begin(),
                    available_color_profiles_.end(),
                    profile) != available_color_profiles_.end();
 }
 
 bool DisplayInfo::Use125DSFRorUIScaling() const {
   return use_125_dsf_for_ui_scaling && id_ == gfx::Display::InternalDisplayId();
 }
 
 }  // namespace ash