Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 16:55:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 780146 - Part d: Inline mozilla::dom::binding::DefineConstructor; r=bz

Browse Source
This commit is contained in:
Ms2ger 2012-10-02 10:07:36 +02:00
parent 29e93229d9
commit 71ea38005c
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/base/nsDOMClassInfo.cpp
View File

@ -6817,10 +6817,12 @@ nsWindowSH::GlobalResolve(nsGlobalWindow *aWin, JSContext *cx,
return NS_OK;
}
if (mozilla::dom::DefineConstructor(cx, obj, define, &rv)) {
*did_resolve = NS_SUCCEEDED(rv);
return rv;
bool enabled;
bool defined = define(cx, obj, &enabled);
MOZ_ASSERT_IF(defined, enabled);
if (enabled) {
*did_resolve = defined;
return defined ? NS_OK : NS_ERROR_FAILURE;
}
}
}

11
js/xpconnect/src/dombindings.cpp
View File

@ -150,17 +150,6 @@ size_t ListBase<LC>::sProtoMethodsCount = 0;
template<class LC>
ListBase<LC> ListBase<LC>::instance;
bool
DefineConstructor(JSContext *cx, JSObject *obj, DefineInterface aDefine, nsresult *aResult)
{
bool enabled;
bool defined = aDefine(cx, obj, &enabled);
NS_ASSERTION(!defined || enabled,
"We defined a constructor but the new bindings are disabled?");
*aResult = defined ? NS_OK : NS_ERROR_FAILURE;
return enabled;
}
template<class LC>
typename ListBase<LC>::ListType*
ListBase<LC>::getNative(JSObject *obj)

3
js/xpconnect/src/xpcpublic.h
View File

@ -352,9 +352,6 @@ extern bool
DefineStaticJSVals(JSContext *cx);
void
Register(nsScriptNameSpaceManager* aNameSpaceManager);
extern bool
DefineConstructor(JSContext *cx, JSObject *obj, DefineInterface aDefine,
nsresult *aResult);
namespace oldproxybindings {