1 files changed, 21 insertions, 15 deletions
diff --git a/Source/WebCore/platform/chromium/support/WebMediaConstraints.cpp b/Source/WebCore/platform/chromium/support/WebMediaConstraints.cpp
index 05fa3f666..6b2305efe 100644
--- a/Source/WebCore/platform/chromium/support/WebMediaConstraints.cpp
+++ b/Source/WebCore/platform/chromium/support/WebMediaConstraints.cpp
@@ -40,11 +40,22 @@ using namespace WebCore;
 
 namespace WebKit {
 
+WebMediaConstraint::WebMediaConstraint(const WebCore::MediaConstraint& other)
+    : m_name(other.m_name)
+    , m_value(other.m_value)
+{
+}
+
 WebMediaConstraints::WebMediaConstraints(const PassRefPtr<MediaConstraints>& constraints)
     : m_private(constraints)
 {
 }
 
+WebMediaConstraints::WebMediaConstraints(MediaConstraints* constraints)
+    : m_private(constraints)
+{
+}
+
 void WebMediaConstraints::assign(const WebMediaConstraints& other)
 {
     m_private = other.m_private;
@@ -55,27 +66,22 @@ void WebMediaConstraints::reset()
     m_private.reset();
 }
 
-bool WebMediaConstraints::isNull() const
-{
-    return m_private.isNull();
-}
-
-void WebMediaConstraints::getMandatoryConstraintNames(WebVector<WebString>& names) const
+void WebMediaConstraints::getMandatoryConstraints(WebVector<WebMediaConstraint>& constraints) const
 {
     ASSERT(!isNull());
-    Vector<String> constraintNames;
-    m_private->getMandatoryConstraintNames(constraintNames);
-    WebVector<WebString> result(constraintNames);
-    names.swap(result);
+    Vector<MediaConstraint> mandatoryConstraints;
+    m_private->getMandatoryConstraints(mandatoryConstraints);
+    WebVector<WebMediaConstraint> result(mandatoryConstraints);
+    constraints.swap(result);
 }
 
-void WebMediaConstraints::getOptionalConstraintNames(WebVector<WebString>& names) const
+void WebMediaConstraints::getOptionalConstraints(WebVector<WebMediaConstraint>& constraints) const
 {
     ASSERT(!isNull());
-    Vector<String> constraintNames;
-    m_private->getOptionalConstraintNames(constraintNames);
-    WebVector<WebString> result(constraintNames);
-    names.swap(result);
+    Vector<MediaConstraint> optionalConstraints;
+    m_private->getOptionalConstraints(optionalConstraints);
+    WebVector<WebMediaConstraint> result(optionalConstraints);
+    constraints.swap(result);
 }
 
 bool WebMediaConstraints::getMandatoryConstraintValue(const WebString& name, WebString& value) const