| 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 |
| 11 #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" | 11 #include "webrtc/modules/desktop_capture/mac/desktop_configuration.h" |
| 12 | 12 |
| 13 #include <math.h> | 13 #include <math.h> |
| 14 #include <algorithm> | 14 #include <algorithm> |
| 15 #include <Cocoa/Cocoa.h> | 15 #include <Cocoa/Cocoa.h> |
| 16 | 16 |
| 17 #include "webrtc/system_wrappers/include/logging.h" | |
| 18 | |
| 19 #if !defined(MAC_OS_X_VERSION_10_7) || \ | 17 #if !defined(MAC_OS_X_VERSION_10_7) || \ |
| 20 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7 | 18 MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_7 |
| 21 | 19 |
| 22 @interface NSScreen (LionAPI) | 20 @interface NSScreen (LionAPI) |
| 23 - (CGFloat)backingScaleFactor; | 21 - (CGFloat)backingScaleFactor; |
| 24 - (NSRect)convertRectToBacking:(NSRect)aRect; | 22 - (NSRect)convertRectToBacking:(NSRect)aRect; |
| 25 @end | 23 @end |
| 26 | 24 |
| 27 #endif // MAC_OS_X_VERSION_10_7 | 25 #endif // MAC_OS_X_VERSION_10_7 |
| 28 | 26 |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 CGDirectDisplayID id) { | 181 CGDirectDisplayID id) { |
| 184 for (MacDisplayConfigurations::const_iterator it = displays.begin(); | 182 for (MacDisplayConfigurations::const_iterator it = displays.begin(); |
| 185 it != displays.end(); ++it) { | 183 it != displays.end(); ++it) { |
| 186 if (it->id == id) | 184 if (it->id == id) |
| 187 return &(*it); | 185 return &(*it); |
| 188 } | 186 } |
| 189 return NULL; | 187 return NULL; |
| 190 } | 188 } |
| 191 | 189 |
| 192 } // namespace webrtc | 190 } // namespace webrtc |
| OLD | NEW |