From d4f809f95ed5687f38d043a5d8b7afd8020683d5 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Sun, 26 Apr 2015 16:49:43 +0200 Subject: [PATCH] Fix generation of nullary callbacks --- components/script/dom/bindings/codegen/CodegenRust.py | 5 +---- components/script/dom/webidls/BrowserElement.webidl | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 1ef3cc0b810..446ddd3b674 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -4918,9 +4918,6 @@ class CGCallback(CGClass): args.append(Argument("ExceptionHandling", "aExceptionHandling", "ReportExceptions")) - args[0] = Argument(args[0].argType, args[0].name, args[0].default) - method.args[2] = args[0] - # And now insert our template argument. argsWithoutThis = list(args) args.insert(0, Argument("JSRef", "thisObj")) @@ -5235,7 +5232,7 @@ class CallbackMethod(CallbackMember): replacements["argv"] = "argv.as_mut_ptr()" replacements["argc"] = "argc" else: - replacements["argv"] = "nullptr" + replacements["argv"] = "ptr::null_mut()" replacements["argc"] = "0" return string.Template("${getCallable}" "let ok = unsafe {\n" diff --git a/components/script/dom/webidls/BrowserElement.webidl b/components/script/dom/webidls/BrowserElement.webidl index a0db071972e..f36f3b8a408 100644 --- a/components/script/dom/webidls/BrowserElement.webidl +++ b/components/script/dom/webidls/BrowserElement.webidl @@ -4,7 +4,7 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ -//callback BrowserElementNextPaintEventCallback = void (); +callback BrowserElementNextPaintEventCallback = void (); //dictionary BrowserElementDownloadOptions { // DOMString? filename;