| 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 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #if ENABLE(MEDIA_STREAM) | 33 #if ENABLE(MEDIA_STREAM) |
| 34 | 34 |
| 35 #include <public/WebRTCConfiguration.h> | 35 #include <public/WebRTCConfiguration.h> |
| 36 | 36 |
| 37 #include "RTCConfiguration.h" | 37 #include "core/platform/mediastream/RTCConfiguration.h" |
| 38 #include <public/WebString.h> | 38 #include <public/WebString.h> |
| 39 #include <public/WebURL.h> | 39 #include <public/WebURL.h> |
| 40 #include <public/WebVector.h> | 40 #include <public/WebVector.h> |
| 41 | 41 |
| 42 using namespace WebCore; | 42 using namespace WebCore; |
| 43 | 43 |
| 44 namespace WebKit { | 44 namespace WebKit { |
| 45 | 45 |
| 46 WebRTCICEServer::WebRTCICEServer(const PassRefPtr<RTCIceServer>& iceServer) | 46 WebRTCICEServer::WebRTCICEServer(const PassRefPtr<RTCIceServer>& iceServer) |
| 47 : m_private(iceServer) | 47 : m_private(iceServer) |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 | 93 |
| 94 WebRTCICEServer WebRTCConfiguration::server(size_t index) const | 94 WebRTCICEServer WebRTCConfiguration::server(size_t index) const |
| 95 { | 95 { |
| 96 ASSERT(!isNull()); | 96 ASSERT(!isNull()); |
| 97 return WebRTCICEServer(m_private->server(index)); | 97 return WebRTCICEServer(m_private->server(index)); |
| 98 } | 98 } |
| 99 | 99 |
| 100 } // namespace WebKit | 100 } // namespace WebKit |
| 101 | 101 |
| 102 #endif // ENABLE(MEDIA_STREAM) | 102 #endif // ENABLE(MEDIA_STREAM) |
| OLD | NEW |