From cfbe4644281b2b2d0fe955a2594badbef2083585 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 29 Jan 2015 21:09:52 +0100 Subject: Rename GetCallableProperty to get_callable_property. --- components/script/dom/bindings/codegen/CodegenRust.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index b723f16dca0..2fbda77ad3d 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -5083,7 +5083,7 @@ class CallbackOperationBase(CallbackMethod): "methodName": self.methodName } getCallableFromProp = string.Template( - 'match self.parent.GetCallableProperty(cx, "${methodName}") {\n' + 'match self.parent.get_callable_property(cx, "${methodName}") {\n' ' Err(_) => return Err(FailureUnknown),\n' ' Ok(callable) => callable,\n' '}').substitute(replacements) -- cgit v1.2.3 From bbf13590243866f1ca57a56ebd4be1d9bf04a56f Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 29 Jan 2015 21:12:00 +0100 Subject: Rename WrapCallThisObject to wrap_call_this_object. --- components/script/dom/bindings/codegen/CodegenRust.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 2fbda77ad3d..48b147c4ebe 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -4566,7 +4566,7 @@ class CGBindingRoot(CGThing): 'dom::bindings::trace::JSTraceable', 'dom::bindings::callback::{CallbackContainer,CallbackInterface,CallbackFunction}', 'dom::bindings::callback::{CallSetup,ExceptionHandling}', - 'dom::bindings::callback::{WrapCallThisObject}', + 'dom::bindings::callback::wrap_call_this_object', 'dom::bindings::conversions::{FromJSValConvertible, ToJSValConvertible}', 'dom::bindings::conversions::{unwrap, unwrap_jsmanaged}', 'dom::bindings::conversions::DOM_OBJECT_SLOT', @@ -4748,7 +4748,7 @@ class CGCallback(CGClass): bodyWithThis = string.Template( setupCall+ - "let thisObjJS = WrapCallThisObject(s.GetContext(), thisObj);\n" + "let thisObjJS = wrap_call_this_object(s.GetContext(), thisObj);\n" "if thisObjJS.is_null() {\n" " return Err(FailureUnknown);\n" "}\n" -- cgit v1.2.3 From 36ce24454c2f51a6e84630e42141d75b21e259e2 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 29 Jan 2015 21:13:15 +0100 Subject: Rename GetContext to get_context. --- components/script/dom/bindings/codegen/CodegenRust.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'components/script/dom/bindings/codegen/CodegenRust.py') diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py index 48b147c4ebe..257ab3b1675 100644 --- a/components/script/dom/bindings/codegen/CodegenRust.py +++ b/components/script/dom/bindings/codegen/CodegenRust.py @@ -4721,8 +4721,8 @@ class CGCallback(CGClass): # Record the names of all the arguments, so we can use them when we call # the private method. argnames = [arg.name for arg in args] - argnamesWithThis = ["s.GetContext()", "thisObjJS"] + argnames - argnamesWithoutThis = ["s.GetContext()", "ptr::null_mut()"] + argnames + argnamesWithThis = ["s.get_context()", "thisObjJS"] + argnames + argnamesWithoutThis = ["s.get_context()", "ptr::null_mut()"] + argnames # Now that we've recorded the argnames for our call to our private # method, insert our optional argument for deciding whether the # CallSetup should re-throw exceptions on aRv. @@ -4742,13 +4742,13 @@ class CGCallback(CGClass): argsWithoutThis.insert(0, Argument(None, "self")) setupCall = ("let s = CallSetup::new(self, aExceptionHandling);\n" - "if s.GetContext().is_null() {\n" + "if s.get_context().is_null() {\n" " return Err(FailureUnknown);\n" "}\n") bodyWithThis = string.Template( setupCall+ - "let thisObjJS = wrap_call_this_object(s.GetContext(), thisObj);\n" + "let thisObjJS = wrap_call_this_object(s.get_context(), thisObj);\n" "if thisObjJS.is_null() {\n" " return Err(FailureUnknown);\n" "}\n" @@ -5000,7 +5000,7 @@ class CallbackMember(CGNativeMember): return "" return ( "CallSetup s(CallbackPreserveColor(), aRv, aExceptionHandling);\n" - "JSContext* cx = s.GetContext();\n" + "JSContext* cx = s.get_context();\n" "if (!cx) {\n" " return Err(FailureUnknown);\n" "}\n") -- cgit v1.2.3