Treat undefined arguments in JS as missing

servo · bors-servo · Dec 13, 2015 · Dec 6, 2015 · Dec 13, 2015 · db92a8b0303c2955e8f569418ffdf748381a4b68
commit db92a8b0303c2955e8f569418ffdf748381a4b68
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -1142,7 +1142,6 @@ def __init__(self, argument, index, args, argc, descriptorProvider,
             "argc": argc,
             "args": args
         }
-        condition = string.Template("${index} < ${argc}").substitute(replacer)
 
         replacementVariables = {
             "val": string.Template("${args}.get(${index})").substitute(replacer),
@@ -1164,17 +1163,18 @@ def __init__(self, argument, index, args, argc, descriptorProvider,
 
         if not argument.variadic:
             if argument.optional:
+                condition = "{args}.get({index}).is_undefined()".format(**replacer)
                 if argument.defaultValue:
                     assert default
                     template = CGIfElseWrapper(condition,
-                                               CGGeneric(template),
-                                               CGGeneric(default)).define()
+                                               CGGeneric(default),
+                                               CGGeneric(template)).define()
                 else:
                     assert not default
                     declType = CGWrapper(declType, pre="Option<", post=">")
                     template = CGIfElseWrapper(condition,
-                                               CGGeneric("Some(%s)" % template),
-                                               CGGeneric("None")).define()
+                                               CGGeneric("None"),
+                                               CGGeneric("Some(%s)" % template)).define()
             else:
                 assert not default
 

diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
diff --git a/tests/wpt/metadata-css/geometry-1_dev/html/DOMPoint-001.htm.ini b/tests/wpt/metadata-css/geometry-1_dev/html/DOMPoint-001.htm.ini
@@ -24,9 +24,6 @@
   [testConstructorDictionary5]
     expected: FAIL
 
-  [testConstructor2undefined]
-    expected: FAIL
-
   [testConstructorDictionary2irregular]
     expected: FAIL
 

diff --git a/tests/wpt/metadata-css/geometry-1_dev/html/DOMRect-001.htm.ini b/tests/wpt/metadata-css/geometry-1_dev/html/DOMRect-001.htm.ini
diff --git a/tests/wpt/metadata/dom/nodes/Comment-constructor.html.ini b/tests/wpt/metadata/dom/nodes/Comment-constructor.html.ini
@@ -1,8 +1,5 @@
 [Comment-constructor.html]
   type: testharness
-  [new Comment(): undefined]
-    expected: FAIL
-
   [new Comment() should get the correct ownerDocument across globals]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/dom/nodes/DOMImplementation-createHTMLDocument.html.ini b/tests/wpt/metadata/dom/nodes/DOMImplementation-createHTMLDocument.html.ini
@@ -3,9 +3,6 @@
   [createHTMLDocument(): URL parsing]
     expected: FAIL
 
-  [createHTMLDocument test 2: undefined,undefined,""]
-    expected: FAIL
-
   [createHTMLDocument(): characterSet aliases]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/dom/nodes/Text-constructor.html.ini b/tests/wpt/metadata/dom/nodes/Text-constructor.html.ini
@@ -1,8 +1,5 @@
 [Text-constructor.html]
   type: testharness
-  [new Text(): undefined]
-    expected: FAIL
-
   [new Text() should get the correct ownerDocument across globals]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/dom/traversal/NodeIterator.html.ini b/tests/wpt/metadata/dom/traversal/NodeIterator.html.ini
diff --git a/tests/wpt/metadata/dom/traversal/TreeWalker-basic.html.ini b/tests/wpt/metadata/dom/traversal/TreeWalker-basic.html.ini
diff --git a/tests/wpt/metadata/encoding/api-basics.html.ini b/tests/wpt/metadata/encoding/api-basics.html.ini
@@ -1,8 +1,5 @@
 [api-basics.html]
   type: testharness
-  [Default inputs]
-    expected: FAIL
-
   [Encode/decode round trip: utf-8]
     expected: FAIL
 

diff --git a/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/document.title-07.html.ini b/tests/wpt/metadata/html/dom/documents/dom-tree-accessors/document.title-07.html.ini
diff --git a/tests/wpt/metadata/websockets/Close-undefined.htm.ini b/tests/wpt/metadata/websockets/Close-undefined.htm.ini
diff --git a/tests/wpt/metadata/websockets/Secure-Close-undefined.htm.ini b/tests/wpt/metadata/websockets/Secure-Close-undefined.htm.ini