| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 { | 126 { |
| 127 assign(other); | 127 assign(other); |
| 128 return *this; | 128 return *this; |
| 129 } | 129 } |
| 130 | 130 |
| 131 BLINK_PLATFORM_EXPORT void assign(const WebRTCConfiguration&); | 131 BLINK_PLATFORM_EXPORT void assign(const WebRTCConfiguration&); |
| 132 | 132 |
| 133 BLINK_PLATFORM_EXPORT void reset(); | 133 BLINK_PLATFORM_EXPORT void reset(); |
| 134 bool isNull() const { return m_private.isNull(); } | 134 bool isNull() const { return m_private.isNull(); } |
| 135 | 135 |
| 136 // TODO(guoweis): Remove next 2 functions when WebKit rolls into Chromium. | |
| 137 BLINK_PLATFORM_EXPORT size_t numberOfServers() const; | |
| 138 BLINK_PLATFORM_EXPORT WebRTCICEServer server(size_t index) const; | |
| 139 | |
| 140 BLINK_PLATFORM_EXPORT WebRTCIceTransports iceTransports() const; | 136 BLINK_PLATFORM_EXPORT WebRTCIceTransports iceTransports() const; |
| 141 | 137 |
| 142 BLINK_PLATFORM_EXPORT WebRTCBundlePolicy bundlePolicy() const; | 138 BLINK_PLATFORM_EXPORT WebRTCBundlePolicy bundlePolicy() const; |
| 143 | 139 |
| 144 BLINK_PLATFORM_EXPORT WebRTCRtcpMuxPolicy rtcpMuxPolicy() const; | 140 BLINK_PLATFORM_EXPORT WebRTCRtcpMuxPolicy rtcpMuxPolicy() const; |
| 145 BLINK_PLATFORM_EXPORT WebRTCICEServerArray iceServers() const; | 141 BLINK_PLATFORM_EXPORT WebRTCICEServerArray iceServers() const; |
| 146 | 142 |
| 147 #if INSIDE_BLINK | 143 #if INSIDE_BLINK |
| 148 BLINK_PLATFORM_EXPORT WebRTCConfiguration(RTCConfiguration*); | 144 BLINK_PLATFORM_EXPORT WebRTCConfiguration(RTCConfiguration*); |
| 149 #endif | 145 #endif |
| 150 | 146 |
| 151 private: | 147 private: |
| 152 WebPrivatePtr<RTCConfiguration> m_private; | 148 WebPrivatePtr<RTCConfiguration> m_private; |
| 153 }; | 149 }; |
| 154 | 150 |
| 155 } // namespace blink | 151 } // namespace blink |
| 156 | 152 |
| 157 #endif // WebRTCConfiguration_h | 153 #endif // WebRTCConfiguration_h |
| OLD | NEW |