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

Side by Side Diff: Source/modules/mediastream/RTCIceCandidate.cpp

Issue 373423002: Split Dictionary's get and convert into DictionaryHelper. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed LICENSE and windows build Created 6 years, 5 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 | Annotate | Revision Log
OLDNEW
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 14 matching lines...) Expand all
25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
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 #include "modules/mediastream/RTCIceCandidate.h" 32 #include "modules/mediastream/RTCIceCandidate.h"
33 33
34 #include "bindings/core/v8/Dictionary.h" 34 #include "bindings/core/v8/Dictionary.h"
35 #include "bindings/core/v8/DictionaryHelper.h"
35 #include "bindings/core/v8/ExceptionMessages.h" 36 #include "bindings/core/v8/ExceptionMessages.h"
36 #include "bindings/core/v8/ExceptionState.h" 37 #include "bindings/core/v8/ExceptionState.h"
37 #include "core/dom/ExceptionCode.h" 38 #include "core/dom/ExceptionCode.h"
38 39
39 namespace WebCore { 40 namespace WebCore {
40 41
41 RTCIceCandidate* RTCIceCandidate::create(const Dictionary& dictionary, Exception State& exceptionState) 42 RTCIceCandidate* RTCIceCandidate::create(const Dictionary& dictionary, Exception State& exceptionState)
42 { 43 {
43 String candidate; 44 String candidate;
44 bool ok = dictionary.get("candidate", candidate); 45 bool ok = DictionaryHelper::get(dictionary, "candidate", candidate);
45 if (!ok || !candidate.length()) { 46 if (!ok || !candidate.length()) {
46 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."));
47 return nullptr; 48 return nullptr;
48 } 49 }
49 50
50 String sdpMid; 51 String sdpMid;
51 dictionary.get("sdpMid", sdpMid); 52 DictionaryHelper::get(dictionary, "sdpMid", sdpMid);
52 53
53 unsigned short sdpMLineIndex = 0; 54 unsigned short sdpMLineIndex = 0;
54 dictionary.get("sdpMLineIndex", sdpMLineIndex); 55 DictionaryHelper::get(dictionary, "sdpMLineIndex", sdpMLineIndex);
55 56
56 return new RTCIceCandidate(blink::WebRTCICECandidate(candidate, sdpMid, sdpM LineIndex)); 57 return new RTCIceCandidate(blink::WebRTCICECandidate(candidate, sdpMid, sdpM LineIndex));
57 } 58 }
58 59
59 RTCIceCandidate* RTCIceCandidate::create(blink::WebRTCICECandidate webCandidate) 60 RTCIceCandidate* RTCIceCandidate::create(blink::WebRTCICECandidate webCandidate)
60 { 61 {
61 return new RTCIceCandidate(webCandidate); 62 return new RTCIceCandidate(webCandidate);
62 } 63 }
63 64
64 RTCIceCandidate::RTCIceCandidate(blink::WebRTCICECandidate webCandidate) 65 RTCIceCandidate::RTCIceCandidate(blink::WebRTCICECandidate webCandidate)
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 { 97 {
97 m_webCandidate.setSdpMid(sdpMid); 98 m_webCandidate.setSdpMid(sdpMid);
98 } 99 }
99 100
100 void RTCIceCandidate::setSdpMLineIndex(unsigned short sdpMLineIndex) 101 void RTCIceCandidate::setSdpMLineIndex(unsigned short sdpMLineIndex)
101 { 102 {
102 m_webCandidate.setSdpMLineIndex(sdpMLineIndex); 103 m_webCandidate.setSdpMLineIndex(sdpMLineIndex);
103 } 104 }
104 105
105 } // namespace WebCore 106 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698