зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1326105 part 4. Remove the now-unused JSContext argument of the protected CallbackObject constructor. r=smaug
This commit is contained in:
Родитель
ba1f5c039f
Коммит
249298d20c
|
@ -63,10 +63,10 @@ protected:
|
|||
}
|
||||
|
||||
// See CallbackObject for an explanation of the arguments.
|
||||
CallbackFunction(JSContext* aCx, JS::Handle<JSObject*> aCallable,
|
||||
CallbackFunction(JS::Handle<JSObject*> aCallable,
|
||||
nsIGlobalObject* aIncumbentGlobal,
|
||||
const FastCallbackConstructor&)
|
||||
: CallbackObject(aCx, aCallable, aIncumbentGlobal,
|
||||
: CallbackObject(aCallable, aIncumbentGlobal,
|
||||
FastCallbackConstructor())
|
||||
{
|
||||
}
|
||||
|
|
|
@ -44,10 +44,10 @@ protected:
|
|||
JS::MutableHandle<JS::Value> aCallable);
|
||||
|
||||
// See CallbackObject for an explanation of the arguments.
|
||||
CallbackInterface(JSContext* aCx, JS::Handle<JSObject*> aCallable,
|
||||
CallbackInterface(JS::Handle<JSObject*> aCallable,
|
||||
nsIGlobalObject* aIncumbentGlobal,
|
||||
const FastCallbackConstructor&)
|
||||
: CallbackObject(aCx, aCallable, aIncumbentGlobal,
|
||||
: CallbackObject(aCallable, aIncumbentGlobal,
|
||||
FastCallbackConstructor())
|
||||
{
|
||||
}
|
||||
|
|
|
@ -232,7 +232,7 @@ protected:
|
|||
// assumption that we will do that last whenever we decide to actually
|
||||
// HoldJSObjects; see FinishSlowJSInitIfMoreThanOneOwner). If you use this,
|
||||
// you MUST ensure that the object is traced until the HoldJSObjects happens!
|
||||
CallbackObject(JSContext* aCx, JS::Handle<JSObject*> aCallback,
|
||||
CallbackObject(JS::Handle<JSObject*> aCallback,
|
||||
nsIGlobalObject* aIncumbentGlobal,
|
||||
const FastCallbackConstructor&)
|
||||
{
|
||||
|
|
|
@ -15176,15 +15176,14 @@ class CGCallback(CGClass):
|
|||
],
|
||||
body=body),
|
||||
ClassConstructor(
|
||||
[Argument("JSContext*", "aCx"),
|
||||
Argument("JS::Handle<JSObject*>", "aCallback"),
|
||||
[Argument("JS::Handle<JSObject*>", "aCallback"),
|
||||
Argument("nsIGlobalObject*", "aIncumbentGlobal"),
|
||||
Argument("const FastCallbackConstructor&", "")],
|
||||
bodyInHeader=True,
|
||||
visibility="public",
|
||||
explicit=True,
|
||||
baseConstructors=[
|
||||
"%s(aCx, aCallback, aIncumbentGlobal, FastCallbackConstructor())" % self.baseName,
|
||||
"%s(aCallback, aIncumbentGlobal, FastCallbackConstructor())" % self.baseName,
|
||||
],
|
||||
body=body),
|
||||
ClassConstructor(
|
||||
|
@ -15364,7 +15363,7 @@ class CGFastCallback(CGClass):
|
|||
visibility="public",
|
||||
explicit=True,
|
||||
baseConstructors=[
|
||||
"%s(aCx, aCallback, aIncumbentGlobal, FastCallbackConstructor())" %
|
||||
"%s(aCallback, aIncumbentGlobal, FastCallbackConstructor())" %
|
||||
baseName,
|
||||
],
|
||||
body="")
|
||||
|
|
Загрузка…
Ссылка в новой задаче