| 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 #include "modules/mediastream/RTCIceCandidate.h" | 33 #include "modules/mediastream/RTCIceCandidate.h" |
| 34 | 34 |
| 35 #include "bindings/v8/Dictionary.h" | 35 #include "bindings/v8/Dictionary.h" |
| 36 #include "bindings/v8/ExceptionMessages.h" | 36 #include "bindings/v8/ExceptionMessages.h" |
| 37 #include "bindings/v8/ExceptionState.h" | 37 #include "bindings/v8/ExceptionState.h" |
| 38 #include "core/dom/ExceptionCode.h" | 38 #include "core/dom/ExceptionCode.h" |
| 39 | 39 |
| 40 namespace WebCore { | 40 namespace WebCore { |
| 41 | 41 |
| 42 PassRefPtr<RTCIceCandidate> RTCIceCandidate::create(const Dictionary& dictionary
, ExceptionState& exceptionState) | 42 PassRefPtrWillBeRawPtr<RTCIceCandidate> RTCIceCandidate::create(const Dictionary
& dictionary, ExceptionState& exceptionState) |
| 43 { | 43 { |
| 44 String candidate; | 44 String candidate; |
| 45 bool ok = dictionary.get("candidate", candidate); | 45 bool ok = dictionary.get("candidate", candidate); |
| 46 if (!ok || !candidate.length()) { | 46 if (!ok || !candidate.length()) { |
| 47 exceptionState.throwDOMException(TypeMismatchError, ExceptionMessages::i
ncorrectPropertyType("candidate", "is not a string, or is empty.")); | 47 exceptionState.throwDOMException(TypeMismatchError, ExceptionMessages::i
ncorrectPropertyType("candidate", "is not a string, or is empty.")); |
| 48 return nullptr; | 48 return nullptr; |
| 49 } | 49 } |
| 50 | 50 |
| 51 String sdpMid; | 51 String sdpMid; |
| 52 dictionary.get("sdpMid", sdpMid); | 52 dictionary.get("sdpMid", sdpMid); |
| 53 | 53 |
| 54 unsigned short sdpMLineIndex = 0; | 54 unsigned short sdpMLineIndex = 0; |
| 55 dictionary.get("sdpMLineIndex", sdpMLineIndex); | 55 dictionary.get("sdpMLineIndex", sdpMLineIndex); |
| 56 | 56 |
| 57 return adoptRef(new RTCIceCandidate(blink::WebRTCICECandidate(candidate, sdp
Mid, sdpMLineIndex))); | 57 return adoptRefWillBeNoop(new RTCIceCandidate(blink::WebRTCICECandidate(cand
idate, sdpMid, sdpMLineIndex))); |
| 58 } | 58 } |
| 59 | 59 |
| 60 PassRefPtr<RTCIceCandidate> RTCIceCandidate::create(blink::WebRTCICECandidate we
bCandidate) | 60 PassRefPtrWillBeRawPtr<RTCIceCandidate> RTCIceCandidate::create(blink::WebRTCICE
Candidate webCandidate) |
| 61 { | 61 { |
| 62 return adoptRef(new RTCIceCandidate(webCandidate)); | 62 return adoptRefWillBeNoop(new RTCIceCandidate(webCandidate)); |
| 63 } | 63 } |
| 64 | 64 |
| 65 RTCIceCandidate::RTCIceCandidate(blink::WebRTCICECandidate webCandidate) | 65 RTCIceCandidate::RTCIceCandidate(blink::WebRTCICECandidate webCandidate) |
| 66 : m_webCandidate(webCandidate) | 66 : m_webCandidate(webCandidate) |
| 67 { | 67 { |
| 68 ScriptWrappable::init(this); | 68 ScriptWrappable::init(this); |
| 69 } | 69 } |
| 70 | 70 |
| 71 String RTCIceCandidate::candidate() const | 71 String RTCIceCandidate::candidate() const |
| 72 { | 72 { |
| 73 return m_webCandidate.candidate(); | 73 return m_webCandidate.candidate(); |
| 74 } | 74 } |
| 75 | 75 |
| 76 String RTCIceCandidate::sdpMid() const | 76 String RTCIceCandidate::sdpMid() const |
| 77 { | 77 { |
| 78 return m_webCandidate.sdpMid(); | 78 return m_webCandidate.sdpMid(); |
| 79 } | 79 } |
| 80 | 80 |
| 81 unsigned short RTCIceCandidate::sdpMLineIndex() const | 81 unsigned short RTCIceCandidate::sdpMLineIndex() const |
| 82 { | 82 { |
| 83 return m_webCandidate.sdpMLineIndex(); | 83 return m_webCandidate.sdpMLineIndex(); |
| 84 } | 84 } |
| 85 | 85 |
| 86 blink::WebRTCICECandidate RTCIceCandidate::webCandidate() | 86 blink::WebRTCICECandidate RTCIceCandidate::webCandidate() |
| 87 { | 87 { |
| 88 return m_webCandidate; | 88 return m_webCandidate; |
| 89 } | 89 } |
| 90 | 90 |
| 91 } // namespace WebCore | 91 } // namespace WebCore |
| OLD | NEW |