Changeset 134245 in webkit

Timestamp:

Nov 12, 2012 8:34:45 AM (11 years ago)

Author:

tommyw@google.com

Message:

MediaStream API: Make sure that MediaConstraints only has optional and mandatory at the top level
​https://bugs.webkit.org/show_bug.cgi?id=101733

Reviewed by Jochen Eisinger.

Source/WebCore:

This patch adds better verification to MediaConstraintsImpl.

Existing tests expanded to cover this change.

• Modules/mediastream/MediaConstraintsImpl.cpp:

(WebCore::MediaConstraintsImpl::initialize):

LayoutTests:

This patch adds more tests for MediaConstraints.

• fast/mediastream/RTCPeerConnection-expected.txt:
• fast/mediastream/RTCPeerConnection.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt (modified) (1 diff)
• LayoutTests/fast/mediastream/RTCPeerConnection.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/mediastream/MediaConstraintsImpl.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-11-12  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Make sure that MediaConstraints only has optional and mandatory at the top level
+        https://bugs.webkit.org/show_bug.cgi?id=101733
+
+        Reviewed by Jochen Eisinger.
+
+        This patch adds more tests for MediaConstraints.
+
+        * fast/mediastream/RTCPeerConnection-expected.txt:
+        * fast/mediastream/RTCPeerConnection.html:
+
 2012-11-12  Allan Sandfeld Jensen  <allan.jensen@digia.com>
 

trunk/LayoutTests/fast/mediastream/RTCPeerConnection-expected.txt

@@ -32 +32 @@
 PASS new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0,valid_and_supported_2:0}]}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
 PASS new webkitRTCPeerConnection(null, {optional:[{invalid:0}]}); threw exception Error: NOT_SUPPORTED_ERR: DOM Exception 9.
+PASS new webkitRTCPeerConnection(null, {valid_and_supported_1:1}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS new webkitRTCPeerConnection(null, {valid_but_unsupported_1:1}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS new webkitRTCPeerConnection(null, {valid_and_supported_2:1, mandatory:{valid_and_supported_1:1}}); threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
 PASS successfullyParsed is true
 

trunk/LayoutTests/fast/mediastream/RTCPeerConnection.html

@@ -38 +38 @@
 shouldThrow("new webkitRTCPeerConnection(null, {optional:[{valid_and_supported_1:0,valid_and_supported_2:0}]});");
 shouldThrow("new webkitRTCPeerConnection(null, {optional:[{invalid:0}]});");
+shouldThrow("new webkitRTCPeerConnection(null, {valid_and_supported_1:1});");
+shouldThrow("new webkitRTCPeerConnection(null, {valid_but_unsupported_1:1});");
+shouldThrow("new webkitRTCPeerConnection(null, {valid_and_supported_2:1, mandatory:{valid_and_supported_1:1}});");
 </script>
 <script src="../js/resources/js-test-post.js"></script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-11-12  Tommy Widenflycht  <tommyw@google.com>
+
+        MediaStream API: Make sure that MediaConstraints only has optional and mandatory at the top level
+        https://bugs.webkit.org/show_bug.cgi?id=101733
+
+        Reviewed by Jochen Eisinger.
+
+        This patch adds better verification to MediaConstraintsImpl.
+
+        Existing tests expanded to cover this change.
+
+        * Modules/mediastream/MediaConstraintsImpl.cpp:
+        (WebCore::MediaConstraintsImpl::initialize):
+
 2012-11-12  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/Modules/mediastream/MediaConstraintsImpl.cpp

@@ -66 +66 @@
 
     String mandatory = ASCIILiteral("mandatory");
+    String optional = ASCIILiteral("optional");
+
+    for (Vector<String>::iterator it = names.begin(); it != names.end(); ++it) {
+        if (*it != mandatory && *it != optional)
+            return false;
+    }
+
     if (names.contains(mandatory)) {
         Dictionary mandatoryConstraints;
@@ -77 +84 @@
     }
 
-    String optional = ASCIILiteral("optional");
     if (names.contains(optional)) {
         ArrayValue optionalConstraints;