Merge pull request #448 from tobie/cont-webidl-fix

Fix Contiguous WebIDL support for callbacks with multiple args.
w3c · Jun 11, 2015 · 728c77e · 728c77e
2 parents 58a09b3 + f0db541
commit 728c77e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/js/core/webidl-contiguous.js b/js/core/webidl-contiguous.js
@@ -387,6 +387,9 @@ define(
                     return idlDictionaryTmpl({ obj: obj, indent: indent, children: children, partial: obj.partial ? "partial " : "" });
                 case "callback":
                     var params = obj.arguments
+                                    .filter(function(it) {
+                                        return !typeIsWhitespace(it.type);
+                                    })
                                     .map(function (it) {
                                         return idlParamTmpl({
                                             obj:        it

diff --git a/tests/spec/core/webidl-contiguous-spec.js b/tests/spec/core/webidl-contiguous-spec.js
@@ -438,6 +438,16 @@ describe("Core - Contiguous WebIDL", function () {
         // Links and IDs.
         expect($target.find(":contains('CbLessBasic')").filter("a").attr("href")).toEqual("#dom-cblessbasic");
         expect($target.find(".idlCallback:contains('CbLessBasic')").attr("id")).toEqual("idl-def-cblessbasic");
+
+        $target = $("#cb-mult-args", doc);
+        text = "callback SortCallback = void (any a, any b);";
+        expect($target.text()).toEqual(text);
+        var $prm = $target.find(".idlCallback").last().find(".idlParam");
+        expect($prm.length).toEqual(2);
+        expect($prm.find(".idlParamType").first().text()).toEqual("any");
+        expect($prm.find(".idlParamName").first().text()).toEqual("a");
+        expect($prm.find(".idlParamType").last().text()).toEqual("any");
+        expect($prm.find(".idlParamName").last().text()).toEqual("b");
     });
 
     it("should handle typedefs", function () {

diff --git a/tests/spec/core/webidl-contiguous.html b/tests/spec/core/webidl-contiguous.html
@@ -423,6 +423,12 @@ <h2>Callbacks</h2>
       <pre id='cb-less-basic' class='idl'>
         callback CbLessBasic = unsigned long long?(optional any value);
       </pre>
+      <p>
+        Callback with multiple arguments.
+      </p>
+      <pre id='cb-mult-args' class='idl'>
+        callback SortCallback = void (any a, any b);
+      </pre>
       <p id="cb-less-basic-doc"><dfn>CbLessBasic</dfn></p>
       <!--
         XXX extattr?