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

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

Issue 469773002: Cleanup blink:: prefix usage in Source/core/modules/[mediasource/*.cpp to websockets/*.cpp] (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/modules/mediasource/MediaSource.cpp ('k') | Source/modules/mediastream/MediaDeviceInfo.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/mediastream/MediaConstraintsImpl.cpp
diff --git a/Source/modules/mediastream/MediaConstraintsImpl.cpp b/Source/modules/mediastream/MediaConstraintsImpl.cpp
index 14ef9ad2c436e8d0d7d36eb5592fc5cc146b3e63..cc9f7f5eb3a7baf2a48ff75059da4edf4f48c7c0 100644
--- a/Source/modules/mediastream/MediaConstraintsImpl.cpp
+++ b/Source/modules/mediastream/MediaConstraintsImpl.cpp
@@ -41,9 +41,10 @@
#include "wtf/text/StringHash.h"
namespace blink {
+
namespace MediaConstraintsImpl {
-static bool parse(const Dictionary& constraintsDictionary, blink::WebVector<blink::WebMediaConstraint>& optional, blink::WebVector<blink::WebMediaConstraint>& mandatory)
+static bool parse(const Dictionary& constraintsDictionary, WebVector<WebMediaConstraint>& optional, WebVector<WebMediaConstraint>& mandatory)
{
if (constraintsDictionary.isUndefinedOrNull())
return true;
@@ -59,7 +60,7 @@ static bool parse(const Dictionary& constraintsDictionary, blink::WebVector<blin
return false;
}
- Vector<blink::WebMediaConstraint> mandatoryConstraintsVector;
+ Vector<WebMediaConstraint> mandatoryConstraintsVector;
if (names.contains(mandatoryName)) {
Dictionary mandatoryConstraintsDictionary;
bool ok = constraintsDictionary.get(mandatoryName, mandatoryConstraintsDictionary);
@@ -73,10 +74,10 @@ static bool parse(const Dictionary& constraintsDictionary, blink::WebVector<blin
HashMap<String, String>::const_iterator iter = mandatoryConstraintsHashMap.begin();
for (; iter != mandatoryConstraintsHashMap.end(); ++iter)
- mandatoryConstraintsVector.append(blink::WebMediaConstraint(iter->key, iter->value));
+ mandatoryConstraintsVector.append(WebMediaConstraint(iter->key, iter->value));
}
- Vector<blink::WebMediaConstraint> optionalConstraintsVector;
+ Vector<WebMediaConstraint> optionalConstraintsVector;
if (names.contains(optionalName)) {
ArrayValue optionalConstraints;
bool ok = DictionaryHelper::get(constraintsDictionary, optionalName, optionalConstraints);
@@ -102,7 +103,7 @@ static bool parse(const Dictionary& constraintsDictionary, blink::WebVector<blin
ok = DictionaryHelper::get(constraint, key, value);
if (!ok)
return false;
- optionalConstraintsVector.append(blink::WebMediaConstraint(key, value));
+ optionalConstraintsVector.append(WebMediaConstraint(key, value));
}
}
@@ -112,23 +113,23 @@ static bool parse(const Dictionary& constraintsDictionary, blink::WebVector<blin
}
-blink::WebMediaConstraints create(const Dictionary& constraintsDictionary, ExceptionState& exceptionState)
+WebMediaConstraints create(const Dictionary& constraintsDictionary, ExceptionState& exceptionState)
{
- blink::WebVector<blink::WebMediaConstraint> optional;
- blink::WebVector<blink::WebMediaConstraint> mandatory;
+ WebVector<WebMediaConstraint> optional;
+ WebVector<WebMediaConstraint> mandatory;
if (!parse(constraintsDictionary, optional, mandatory)) {
exceptionState.throwTypeError("Malformed constraints object.");
- return blink::WebMediaConstraints();
+ return WebMediaConstraints();
}
- blink::WebMediaConstraints constraints;
+ WebMediaConstraints constraints;
constraints.initialize(optional, mandatory);
return constraints;
}
-blink::WebMediaConstraints create()
+WebMediaConstraints create()
{
- blink::WebMediaConstraints constraints;
+ WebMediaConstraints constraints;
constraints.initialize();
return constraints;
}
« no previous file with comments | « Source/modules/mediasource/MediaSource.cpp ('k') | Source/modules/mediastream/MediaDeviceInfo.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698