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

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

Issue 373423002: Split Dictionary's get and convert into DictionaryHelper. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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) 2011 Ericsson AB. All rights reserved. 2 * Copyright (C) 2011 Ericsson AB. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 static blink::WebMediaConstraints parseOptions(const Dictionary& options, const String& mediaType, ExceptionState& exceptionState) 50 static blink::WebMediaConstraints parseOptions(const Dictionary& options, const String& mediaType, ExceptionState& exceptionState)
51 { 51 {
52 blink::WebMediaConstraints constraints; 52 blink::WebMediaConstraints constraints;
53 53
54 Dictionary constraintsDictionary; 54 Dictionary constraintsDictionary;
55 bool ok = options.get(mediaType, constraintsDictionary); 55 bool ok = options.get(mediaType, constraintsDictionary);
56 if (ok && !constraintsDictionary.isUndefinedOrNull()) 56 if (ok && !constraintsDictionary.isUndefinedOrNull())
57 constraints = MediaConstraintsImpl::create(constraintsDictionary, except ionState); 57 constraints = MediaConstraintsImpl::create(constraintsDictionary, except ionState);
58 else { 58 else {
59 bool mediaRequested = false; 59 bool mediaRequested = false;
60 options.get(mediaType, mediaRequested); 60 DictionaryHelper::get(options, mediaType, mediaRequested);
61 if (mediaRequested) 61 if (mediaRequested)
62 constraints = MediaConstraintsImpl::create(); 62 constraints = MediaConstraintsImpl::create();
63 } 63 }
64 64
65 return constraints; 65 return constraints;
66 } 66 }
67 67
68 UserMediaRequest* UserMediaRequest::create(ExecutionContext* context, UserMediaC ontroller* controller, const Dictionary& options, PassOwnPtr<NavigatorUserMediaS uccessCallback> successCallback, PassOwnPtr<NavigatorUserMediaErrorCallback> err orCallback, ExceptionState& exceptionState) 68 UserMediaRequest* UserMediaRequest::create(ExecutionContext* context, UserMediaC ontroller* controller, const Dictionary& options, PassOwnPtr<NavigatorUserMediaS uccessCallback> successCallback, PassOwnPtr<NavigatorUserMediaErrorCallback> err orCallback, ExceptionState& exceptionState)
69 { 69 {
70 blink::WebMediaConstraints audio = parseOptions(options, "audio", exceptionS tate); 70 blink::WebMediaConstraints audio = parseOptions(options, "audio", exceptionS tate);
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
179 { 179 {
180 if (m_controller) { 180 if (m_controller) {
181 m_controller->cancelUserMediaRequest(this); 181 m_controller->cancelUserMediaRequest(this);
182 m_controller = 0; 182 m_controller = 0;
183 } 183 }
184 184
185 ContextLifecycleObserver::contextDestroyed(); 185 ContextLifecycleObserver::contextDestroyed();
186 } 186 }
187 187
188 } // namespace WebCore 188 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/modules/mediastream/RTCSessionDescription.cpp ('k') | Source/modules/notifications/Notification.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698