OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2013 The WebRTC project authors. All Rights Reserved. |
3 * | 3 * |
4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
9 */ | 9 */ |
10 | 10 |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 display_config.pixel_bounds = NSRectToDesktopRect(ns_pixel_bounds); | 78 display_config.pixel_bounds = NSRectToDesktopRect(ns_pixel_bounds); |
79 } else { | 79 } else { |
80 display_config.pixel_bounds = display_config.bounds; | 80 display_config.pixel_bounds = display_config.bounds; |
81 } | 81 } |
82 | 82 |
83 return display_config; | 83 return display_config; |
84 } | 84 } |
85 | 85 |
86 } // namespace | 86 } // namespace |
87 | 87 |
88 MacDisplayConfiguration::MacDisplayConfiguration() | 88 MacDisplayConfiguration::MacDisplayConfiguration() = default; |
89 : id(0), | 89 MacDisplayConfiguration::MacDisplayConfiguration( |
90 dip_to_pixel_scale(1.0f) { | 90 const MacDisplayConfiguration& other) = default; |
91 } | 91 MacDisplayConfiguration::MacDisplayConfiguration( |
| 92 MacDisplayConfiguration&& other) = default; |
| 93 MacDisplayConfiguration::~MacDisplayConfiguration() = default; |
92 | 94 |
93 MacDesktopConfiguration::MacDesktopConfiguration() | 95 MacDisplayConfiguration& MacDisplayConfiguration::operator=( |
94 : dip_to_pixel_scale(1.0f) { | 96 const MacDisplayConfiguration& other) = default; |
95 } | 97 MacDisplayConfiguration& MacDisplayConfiguration::operator=( |
| 98 MacDisplayConfiguration&& other) = default; |
96 | 99 |
97 MacDesktopConfiguration::~MacDesktopConfiguration() { | 100 MacDesktopConfiguration::MacDesktopConfiguration() = default; |
98 } | 101 MacDesktopConfiguration::MacDesktopConfiguration( |
| 102 const MacDesktopConfiguration& other) = default; |
| 103 MacDesktopConfiguration::MacDesktopConfiguration( |
| 104 MacDesktopConfiguration&& other) = default; |
| 105 MacDesktopConfiguration::~MacDesktopConfiguration() = default; |
| 106 |
| 107 MacDesktopConfiguration& MacDesktopConfiguration::operator=( |
| 108 const MacDesktopConfiguration& other) = default; |
| 109 MacDesktopConfiguration& MacDesktopConfiguration::operator=( |
| 110 MacDesktopConfiguration&& other) = default; |
99 | 111 |
100 // static | 112 // static |
101 MacDesktopConfiguration MacDesktopConfiguration::GetCurrent(Origin origin) { | 113 MacDesktopConfiguration MacDesktopConfiguration::GetCurrent(Origin origin) { |
102 MacDesktopConfiguration desktop_config; | 114 MacDesktopConfiguration desktop_config; |
103 | 115 |
104 NSArray* screens = [NSScreen screens]; | 116 NSArray* screens = [NSScreen screens]; |
105 assert(screens); | 117 assert(screens); |
106 | 118 |
107 // Iterator over the monitors, adding the primary monitor and monitors whose | 119 // Iterator over the monitors, adding the primary monitor and monitors whose |
108 // DPI match that of the primary monitor. | 120 // DPI match that of the primary monitor. |
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 CGDirectDisplayID id) { | 183 CGDirectDisplayID id) { |
172 for (MacDisplayConfigurations::const_iterator it = displays.begin(); | 184 for (MacDisplayConfigurations::const_iterator it = displays.begin(); |
173 it != displays.end(); ++it) { | 185 it != displays.end(); ++it) { |
174 if (it->id == id) | 186 if (it->id == id) |
175 return &(*it); | 187 return &(*it); |
176 } | 188 } |
177 return NULL; | 189 return NULL; |
178 } | 190 } |
179 | 191 |
180 } // namespace webrtc | 192 } // namespace webrtc |
OLD | NEW |