Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-25 00:00:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #5850 - nox:nullary-callbacks, r=jdm

Browse source 
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5850)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-04-27 08:42:42 -05:00
commit 92359c7b9a
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -4918,9 +4918,6 @@ class CGCallback(CGClass):
args.append(Argument("ExceptionHandling", "aExceptionHandling", args.append(Argument("ExceptionHandling", "aExceptionHandling",
"ReportExceptions")) "ReportExceptions"))
args[0] = Argument(args[0].argType, args[0].name, args[0].default)
method.args[2] = args[0]
# And now insert our template argument. # And now insert our template argument.
argsWithoutThis = list(args) argsWithoutThis = list(args)
args.insert(0, Argument("JSRef<T>", "thisObj")) args.insert(0, Argument("JSRef<T>", "thisObj"))
@ -5235,7 +5232,7 @@ class CallbackMethod(CallbackMember):
replacements["argv"] = "argv.as_mut_ptr()" replacements["argv"] = "argv.as_mut_ptr()"
replacements["argc"] = "argc" replacements["argc"] = "argc"
else: else:
replacements["argv"] = "nullptr" replacements["argv"] = "ptr::null_mut()"
replacements["argc"] = "0" replacements["argc"] = "0"
return string.Template("${getCallable}" return string.Template("${getCallable}"
"let ok = unsafe {\n" "let ok = unsafe {\n"

2
components/script/dom/webidls/BrowserElement.webidl
View file

@ -4,7 +4,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. * You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
//callback BrowserElementNextPaintEventCallback = void (); callback BrowserElementNextPaintEventCallback = void ();
//dictionary BrowserElementDownloadOptions { //dictionary BrowserElementDownloadOptions {
// DOMString? filename; // DOMString? filename;