| 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/WebRTCSessionDescription.h> | 35 #include <public/WebRTCSessionDescription.h> |
| 36 | 36 |
| 37 #include "RTCSessionDescriptionDescriptor.h" | 37 #include "core/platform/mediastream/RTCSessionDescriptionDescriptor.h" |
| 38 #include <public/WebString.h> | 38 #include <public/WebString.h> |
| 39 | 39 |
| 40 using namespace WebCore; | 40 using namespace WebCore; |
| 41 | 41 |
| 42 namespace WebKit { | 42 namespace WebKit { |
| 43 | 43 |
| 44 WebRTCSessionDescription::WebRTCSessionDescription(const PassRefPtr<RTCSessionDe
scriptionDescriptor>& sessionDescription) | 44 WebRTCSessionDescription::WebRTCSessionDescription(const PassRefPtr<RTCSessionDe
scriptionDescriptor>& sessionDescription) |
| 45 : m_private(sessionDescription) | 45 : m_private(sessionDescription) |
| 46 { | 46 { |
| 47 } | 47 } |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 void WebRTCSessionDescription::setSDP(const WebString& sdp) | 87 void WebRTCSessionDescription::setSDP(const WebString& sdp) |
| 88 { | 88 { |
| 89 ASSERT(!m_private.isNull()); | 89 ASSERT(!m_private.isNull()); |
| 90 return m_private.get()->setSdp(sdp); | 90 return m_private.get()->setSdp(sdp); |
| 91 } | 91 } |
| 92 | 92 |
| 93 } // namespace WebKit | 93 } // namespace WebKit |
| 94 | 94 |
| 95 #endif // ENABLE(MEDIA_STREAM) | 95 #endif // ENABLE(MEDIA_STREAM) |
| 96 | 96 |
| OLD | NEW |