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

Side by Side Diff: webrtc/engine_configurations.h

Issue 2316563002: Revert of Remove all reference to carbon api (Closed)
Patch Set: Created 4 years, 3 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 | « webrtc/base/unixfilesystem.cc ('k') | webrtc/media/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 #if defined(_WIN32) 54 #if defined(_WIN32)
55 #define DIRECT3D9_RENDERING // Requires DirectX 9. 55 #define DIRECT3D9_RENDERING // Requires DirectX 9.
56 #endif 56 #endif
57 57
58 // ---------------------------------------------------------------------------- 58 // ----------------------------------------------------------------------------
59 // VideoEngine MAC 59 // VideoEngine MAC
60 // ---------------------------------------------------------------------------- 60 // ----------------------------------------------------------------------------
61 61
62 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS) 62 #if defined(WEBRTC_MAC) && !defined(WEBRTC_IOS)
63 // #define CARBON_RENDERING
63 #define COCOA_RENDERING 64 #define COCOA_RENDERING
64 #endif 65 #endif
65 66
66 // ---------------------------------------------------------------------------- 67 // ----------------------------------------------------------------------------
67 // VideoEngine Mobile iPhone 68 // VideoEngine Mobile iPhone
68 // ---------------------------------------------------------------------------- 69 // ----------------------------------------------------------------------------
69 70
70 #if defined(WEBRTC_IOS) 71 #if defined(WEBRTC_IOS)
71 #define EAGL_RENDERING 72 #define EAGL_RENDERING
72 #endif 73 #endif
73 74
74 #endif // WEBRTC_ENGINE_CONFIGURATIONS_H_ 75 #endif // WEBRTC_ENGINE_CONFIGURATIONS_H_
OLDNEW
« no previous file with comments | « webrtc/base/unixfilesystem.cc ('k') | webrtc/media/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698