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

Side by Side Diff: ash/display/display_info.cc

Issue 647023003: Fix uninitialized field in DisplayInfo ctor (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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stdio.h> 5 #include <stdio.h>
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "ash/display/display_info.h" 9 #include "ash/display/display_info.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 : id_(id), 229 : id_(id),
230 name_(name), 230 name_(name),
231 has_overscan_(has_overscan), 231 has_overscan_(has_overscan),
232 rotation_(gfx::Display::ROTATE_0), 232 rotation_(gfx::Display::ROTATE_0),
233 touch_support_(gfx::Display::TOUCH_SUPPORT_UNKNOWN), 233 touch_support_(gfx::Display::TOUCH_SUPPORT_UNKNOWN),
234 touch_device_id_(0), 234 touch_device_id_(0),
235 device_scale_factor_(1.0f), 235 device_scale_factor_(1.0f),
236 overscan_insets_in_dip_(0, 0, 0, 0), 236 overscan_insets_in_dip_(0, 0, 0, 0),
237 configured_ui_scale_(1.0f), 237 configured_ui_scale_(1.0f),
238 native_(false), 238 native_(false),
239 is_aspect_preserving_scaling_(false),
239 color_profile_(ui::COLOR_PROFILE_STANDARD) { 240 color_profile_(ui::COLOR_PROFILE_STANDARD) {
240 } 241 }
241 242
242 DisplayInfo::~DisplayInfo() { 243 DisplayInfo::~DisplayInfo() {
243 } 244 }
244 245
245 void DisplayInfo::Copy(const DisplayInfo& native_info) { 246 void DisplayInfo::Copy(const DisplayInfo& native_info) {
246 DCHECK(id_ == native_info.id_); 247 DCHECK(id_ == native_info.id_);
247 name_ = native_info.name_; 248 name_ = native_info.name_;
248 has_overscan_ = native_info.has_overscan_; 249 has_overscan_ = native_info.has_overscan_;
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 } 380 }
380 381
381 bool DisplayInfo::IsColorProfileAvailable( 382 bool DisplayInfo::IsColorProfileAvailable(
382 ui::ColorCalibrationProfile profile) const { 383 ui::ColorCalibrationProfile profile) const {
383 return std::find(available_color_profiles_.begin(), 384 return std::find(available_color_profiles_.begin(),
384 available_color_profiles_.end(), 385 available_color_profiles_.end(),
385 profile) != available_color_profiles_.end(); 386 profile) != available_color_profiles_.end();
386 } 387 }
387 388
388 } // namespace ash 389 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698