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

Unified Diff: Source/modules/mediastream/UserMediaRequest.cpp

Issue 72363002: Rename es => exceptionState in other than bindings/ (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Retry Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: Source/modules/mediastream/UserMediaRequest.cpp
diff --git a/Source/modules/mediastream/UserMediaRequest.cpp b/Source/modules/mediastream/UserMediaRequest.cpp
index f1f0e82d7e3284d86364cd21532e99b8eb0ec470..34fa05267aa5a518df1c5c452236886ef55c0f7c 100644
--- a/Source/modules/mediastream/UserMediaRequest.cpp
+++ b/Source/modules/mediastream/UserMediaRequest.cpp
@@ -45,14 +45,14 @@
namespace WebCore {
-static PassRefPtr<MediaConstraintsImpl> parseOptions(const Dictionary& options, const String& mediaType, ExceptionState& es)
+static PassRefPtr<MediaConstraintsImpl> parseOptions(const Dictionary& options, const String& mediaType, ExceptionState& exceptionState)
{
RefPtr<MediaConstraintsImpl> constraints;
Dictionary constraintsDictionary;
bool ok = options.get(mediaType, constraintsDictionary);
if (ok && !constraintsDictionary.isUndefinedOrNull())
- constraints = MediaConstraintsImpl::create(constraintsDictionary, es);
+ constraints = MediaConstraintsImpl::create(constraintsDictionary, exceptionState);
else {
bool mediaRequested = false;
options.get(mediaType, mediaRequested);
@@ -63,14 +63,14 @@ static PassRefPtr<MediaConstraintsImpl> parseOptions(const Dictionary& options,
return constraints.release();
}
-PassRefPtr<UserMediaRequest> UserMediaRequest::create(ExecutionContext* context, UserMediaController* controller, const Dictionary& options, PassRefPtr<NavigatorUserMediaSuccessCallback> successCallback, PassRefPtr<NavigatorUserMediaErrorCallback> errorCallback, ExceptionState& es)
+PassRefPtr<UserMediaRequest> UserMediaRequest::create(ExecutionContext* context, UserMediaController* controller, const Dictionary& options, PassRefPtr<NavigatorUserMediaSuccessCallback> successCallback, PassRefPtr<NavigatorUserMediaErrorCallback> errorCallback, ExceptionState& exceptionState)
{
- RefPtr<MediaConstraintsImpl> audio = parseOptions(options, "audio", es);
- if (es.hadException())
+ RefPtr<MediaConstraintsImpl> audio = parseOptions(options, "audio", exceptionState);
+ if (exceptionState.hadException())
return 0;
- RefPtr<MediaConstraintsImpl> video = parseOptions(options, "video", es);
- if (es.hadException())
+ RefPtr<MediaConstraintsImpl> video = parseOptions(options, "video", exceptionState);
+ if (exceptionState.hadException())
return 0;
if (!audio && !video)
« no previous file with comments | « Source/modules/mediastream/RTCSessionDescription.cpp ('k') | Source/modules/navigatorcontentutils/NavigatorContentUtils.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698