wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 714458 - Part a: Introduce JSAPI for JSContext's second private pointer; r=Waldo

Browse Source 
JSContext currently has 2 private pointers, but the JSAPI only provides access
to one of them.
This commit is contained in:
Ms2ger 2012-01-11 09:23:07 +01:00
parent 0b7161afcb
commit 38fbde8026
4 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/jsapi.cpp
View File

@ -1194,6 +1194,18 @@ JS_SetContextPrivate(JSContext *cx, void *data)
cx->data = data;
}
JS_PUBLIC_API(void *)
JS_GetSecondContextPrivate(JSContext *cx)
{
return cx->data2;
}
JS_PUBLIC_API(void)
JS_SetSecondContextPrivate(JSContext *cx, void *data)
{
cx->data2 = data;
}
JS_PUBLIC_API(JSRuntime *)
JS_GetRuntime(JSContext *cx)
{

6
js/src/jsapi.h
View File

@ -2085,6 +2085,12 @@ JS_GetContextPrivate(JSContext *cx);
extern JS_PUBLIC_API(void)
JS_SetContextPrivate(JSContext *cx, void *data);
extern JS_PUBLIC_API(void *)
JS_GetSecondContextPrivate(JSContext *cx);
extern JS_PUBLIC_API(void)
JS_SetSecondContextPrivate(JSContext *cx, void *data);
extern JS_PUBLIC_API(JSRuntime *)
JS_GetRuntime(JSContext *cx);

10
js/xpconnect/src/XPCContext.cpp
View File

@ -42,6 +42,8 @@
#include "xpcprivate.h"
#include "jsapi.h"
/***************************************************************************/
XPCContext::XPCContext(XPCJSRuntime* aRuntime,
@ -59,15 +61,15 @@ XPCContext::XPCContext(XPCJSRuntime* aRuntime,
PR_INIT_CLIST(&mScopes);
NS_ASSERTION(!mJSContext->data2, "Must be null");
mJSContext->data2 = this;
NS_ASSERTION(!JS_GetSecondContextPrivate(mJSContext), "Must be null");
JS_SetSecondContextPrivate(mJSContext, this);
}
XPCContext::~XPCContext()
{
MOZ_COUNT_DTOR(XPCContext);
NS_ASSERTION(mJSContext->data2 == this, "Must match this");
mJSContext->data2 = nsnull;
NS_ASSERTION(JS_GetSecondContextPrivate(mJSContext) == this, "Must match this");
JS_SetSecondContextPrivate(mJSContext, nsnull);
NS_IF_RELEASE(mException);
NS_IF_RELEASE(mSecurityManager);

4
js/xpconnect/src/xpcprivate.h
View File

@ -859,8 +859,8 @@ class XPCContext
public:
static XPCContext* GetXPCContext(JSContext* aJSContext)
{
NS_ASSERTION(aJSContext->data2, "should already have XPCContext");
return static_cast<XPCContext *>(aJSContext->data2);
NS_ASSERTION(JS_GetSecondContextPrivate(aJSContext), "should already have XPCContext");
return static_cast<XPCContext *>(JS_GetSecondContextPrivate(aJSContext));
}
XPCJSRuntime* GetRuntime() const {return mRuntime;}