Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 04:52:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixing bug #87389 This refreshes prototypes when classes are initialized on the context (Page transition) to prevent changes to prototypes from persisting across document loads. r=dbradley@netscape.com, sr=jst@netscape.com, patch by jband and dbradley (dbradley checking in from jst's account)

Browse Source
This commit is contained in:
jst%netscape.com 2001-07-17 06:20:37 +00:00
parent 9999f89b71
commit f70ebcaecd
10 changed files with 180 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dom/src/base/nsJSEnvironment.cpp
View File

@ -1079,7 +1079,7 @@ nsJSContext::InitContext(nsIScriptGlobalObject *aGlobalObject)
NS_ENSURE_SUCCESS(rv, rv);
} else {
// If there's already a global object in mContext we're called
// after ::JS_ClearScope() was called. We'll haveto tell XPConnect
// after ::JS_ClearScope() was called. We'll have to tell XPConnect
// to re-initialize the global object to do things like define the
// Components object on the global again.
rv = xpc->InitClasses(mContext, global);
@ -1088,19 +1088,18 @@ nsJSContext::InitContext(nsIScriptGlobalObject *aGlobalObject)
nsCOMPtr<nsIClassInfo> ci(do_QueryInterface(aGlobalObject));
if (ci) {
nsCOMPtr<nsIXPConnectJSObjectHolder> proto_holder;
nsCOMPtr<nsIXPConnectJSObjectHolder> holder;
rv = xpc->GetWrappedNativePrototype(mContext, global, ci,
getter_AddRefs(proto_holder));
rv = xpc->WrapNative(mContext, global, aGlobalObject,
NS_GET_IID(nsISupports),
getter_AddRefs(holder));
NS_ENSURE_SUCCESS(rv, rv);
JSObject *proto = nsnull;
rv = proto_holder->GetJSObject(&proto);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIXPConnectWrappedNative> wrapper(do_QueryInterface(holder));
NS_ENSURE_TRUE(wrapper, NS_ERROR_FAILURE);
if (!::JS_SetPrototype(mContext, global, proto)) {
return NS_ERROR_FAILURE;
}
rv = wrapper->RefreshPrototype();
NS_ENSURE_SUCCESS(rv, rv);
}
}

2
js/src/xpconnect/idl/nsIXPConnect.idl
View File

@ -153,6 +153,8 @@ interface nsIXPConnectWrappedNative : nsIXPConnectJSObjectHolder
nsIInterfaceInfo FindInterfaceWithName(in JSVal nameID);
void debugDump(in short depth);
void refreshPrototype();
};
[uuid(BED52030-BCA6-11d2-BA79-00805F8A5DD7)]

7
js/src/xpconnect/src/nsXPConnect.cpp
View File

@ -113,7 +113,12 @@ nsXPConnect::~nsXPConnect()
{ // scoped callcontext
XPCCallContext ccx(NATIVE_CALLER);
if(ccx.IsValid())
{
XPCWrappedNativeScope::SystemIsBeingShutDown(ccx);
if(mRuntime)
mRuntime->SystemIsBeingShutDown(&ccx);
}
}
NS_IF_RELEASE(mInterfaceInfoManager);
@ -364,6 +369,8 @@ nsXPConnect::InitClasses(JSContext * aJSContext, JSObject * aGlobalJSObj)
if(!scope)
return UnexpectedFailure(NS_ERROR_FAILURE);
scope->RemoveWrappedNativeProtos();
if(!nsXPCComponents::AttachNewComponentsObject(ccx, scope, aGlobalJSObj))
return UnexpectedFailure(NS_ERROR_FAILURE);

43
js/src/xpconnect/src/xpcjsruntime.cpp
View File

@ -201,6 +201,17 @@ DyingProtoKiller(JSDHashTable *table, JSDHashEntryHdr *hdr,
return JS_DHASH_REMOVE;
}
JS_STATIC_DLL_CALLBACK(JSDHashOperator)
DetachedWrappedNativeProtoMarker(JSDHashTable *table, JSDHashEntryHdr *hdr,
uint32 number, void *arg)
{
XPCWrappedNativeProto* proto =
(XPCWrappedNativeProto*)((JSDHashEntryStub*)hdr)->key;
proto->Mark();
return JS_DHASH_NEXT;
}
// static
JSBool XPCJSRuntime::GCCallback(JSContext *cx, JSGCStatus status)
{
@ -295,6 +306,9 @@ JSBool XPCJSRuntime::GCCallback(JSContext *cx, JSGCStatus status)
// Do the marking...
XPCWrappedNativeScope::MarkAllWrappedNativesAndProtos();
self->mDetachedWrappedNativeProtoMap->
Enumerate(DetachedWrappedNativeProtoMarker, nsnull);
// Mark the sets used in the call contexts. There is a small
// chance that a wrapper's set will change *while* a call is
// happening which uses that wrapper's old interfface set. So,
@ -555,6 +569,24 @@ WrappedJSShutdownMarker(JSDHashTable *table, JSDHashEntryHdr *hdr,
return JS_DHASH_NEXT;
}
JS_STATIC_DLL_CALLBACK(JSDHashOperator)
DetachedWrappedNativeProtoShutdownMarker(JSDHashTable *table, JSDHashEntryHdr *hdr,
uint32 number, void *arg)
{
XPCWrappedNativeProto* proto =
(XPCWrappedNativeProto*)((JSDHashEntryStub*)hdr)->key;
proto->SystemIsBeingShutDown(*((XPCCallContext*)arg));
return JS_DHASH_NEXT;
}
void XPCJSRuntime::SystemIsBeingShutDown(XPCCallContext* ccx)
{
if(mDetachedWrappedNativeProtoMap)
mDetachedWrappedNativeProtoMap->
Enumerate(DetachedWrappedNativeProtoShutdownMarker, ccx);
}
XPCJSRuntime::~XPCJSRuntime()
{
#ifdef XPC_DUMP_AT_SHUTDOWN
@ -674,6 +706,16 @@ XPCJSRuntime::~XPCJSRuntime()
delete mDyingWrappedNativeProtoMap;
}
if(mDetachedWrappedNativeProtoMap)
{
#ifdef XPC_DUMP_AT_SHUTDOWN
uint32 count = mDetachedWrappedNativeProtoMap->Count();
if(count)
printf("deleting XPCJSRuntime with %d live detached XPCWrappedNativeProto\n", (int)count);
#endif
delete mDetachedWrappedNativeProtoMap;
}
// unwire the readable/JSString sharing magic
XPCStringConvert::ShutdownDOMStringFinalizer();
}
@ -692,6 +734,7 @@ XPCJSRuntime::XPCJSRuntime(nsXPConnect* aXPConnect,
mThisTranslatorMap(IID2ThisTranslatorMap::newMap(XPC_THIS_TRANSLATOR_MAP_SIZE)),
mNativeScriptableSharedMap(XPCNativeScriptableSharedMap::newMap(XPC_NATIVE_JSCLASS_MAP_SIZE)),
mDyingWrappedNativeProtoMap(XPCWrappedNativeProtoMap::newMap(XPC_DYING_NATIVE_PROTO_MAP_SIZE)),
mDetachedWrappedNativeProtoMap(XPCWrappedNativeProtoMap::newMap(XPC_DETACHED_NATIVE_PROTO_MAP_SIZE)),
mMapLock(XPCAutoLock::NewLock("XPCJSRuntime::mMapLock")),
mWrappedJSToReleaseArray(),
mNativesToReleaseArray(),

6
js/src/xpconnect/src/xpcmaps.h
View File

@ -628,6 +628,12 @@ public:
return proto;
}
inline void Remove(XPCWrappedNativeProto* proto)
{
NS_PRECONDITION(proto,"bad param");
JS_DHashTableOperate(mTable, proto, JS_DHASH_REMOVE);
}
inline uint32 Count() {return mTable->entryCount;}
inline uint32 Enumerate(JSDHashEnumerator f, void *arg)
{return JS_DHashTableEnumerate(mTable, f, arg);}

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

@ -135,6 +135,7 @@
//#define DEBUG_stats_jband 1
//#define XPC_REPORT_NATIVE_INTERFACE_AND_SET_FLUSHING
//#define XPC_REPORT_JSCLASS_FLUSHING
//#define XPC_TRACK_AUTOMARKINGPTR_STATS
#endif
/***************************************************************************/
@ -174,17 +175,18 @@ void DEBUG_CheckWrapperThreadSafety(const XPCWrappedNative* wrapper);
/***************************************************************************/
// default initial sizes for maps (hashtables)
#define XPC_CONTEXT_MAP_SIZE 16
#define XPC_JS_MAP_SIZE 64
#define XPC_JS_CLASS_MAP_SIZE 64
#define XPC_CONTEXT_MAP_SIZE 16
#define XPC_JS_MAP_SIZE 64
#define XPC_JS_CLASS_MAP_SIZE 64
#define XPC_NATIVE_MAP_SIZE 64
#define XPC_NATIVE_PROTO_MAP_SIZE 16
#define XPC_DYING_NATIVE_PROTO_MAP_SIZE 16
#define XPC_NATIVE_INTERFACE_MAP_SIZE 64
#define XPC_NATIVE_SET_MAP_SIZE 64
#define XPC_NATIVE_JSCLASS_MAP_SIZE 32
#define XPC_THIS_TRANSLATOR_MAP_SIZE 8
#define XPC_NATIVE_MAP_SIZE 64
#define XPC_NATIVE_PROTO_MAP_SIZE 16
#define XPC_DYING_NATIVE_PROTO_MAP_SIZE 16
#define XPC_DETACHED_NATIVE_PROTO_MAP_SIZE 32
#define XPC_NATIVE_INTERFACE_MAP_SIZE 64
#define XPC_NATIVE_SET_MAP_SIZE 64
#define XPC_NATIVE_JSCLASS_MAP_SIZE 32
#define XPC_THIS_TRANSLATOR_MAP_SIZE 8
/***************************************************************************/
// data declarations...
@ -469,6 +471,9 @@ public:
XPCWrappedNativeProtoMap* GetDyingWrappedNativeProtoMap() const
{return mDyingWrappedNativeProtoMap;}
XPCWrappedNativeProtoMap* GetDetachedWrappedNativeProtoMap() const
{return mDetachedWrappedNativeProtoMap;}
XPCLock* GetMapLock() const {return mMapLock;}
XPCContext* GetXPCContext(JSContext* cx);
@ -528,6 +533,8 @@ public:
void DebugDump(PRInt16 depth);
void SystemIsBeingShutDown(XPCCallContext* ccx);
~XPCJSRuntime();
#ifdef XPC_CHECK_WRAPPERS_AT_SHUTDOWN
@ -573,6 +580,7 @@ private:
IID2ThisTranslatorMap* mThisTranslatorMap;
XPCNativeScriptableSharedMap* mNativeScriptableSharedMap;
XPCWrappedNativeProtoMap* mDyingWrappedNativeProtoMap;
XPCWrappedNativeProtoMap* mDetachedWrappedNativeProtoMap;
XPCLock* mMapLock;
nsVoidArray mWrappedJSToReleaseArray;
nsVoidArray mNativesToReleaseArray;
@ -905,6 +913,8 @@ public:
JSObject*
GetPrototypeJSObject() const {return mPrototypeJSObject;}
void RemoveWrappedNativeProtos();
static XPCWrappedNativeScope*
FindInJSObjectScope(XPCCallContext& ccx, JSObject* obj,
JSBool OKIfNotInitialized = JS_FALSE);
@ -2890,6 +2900,8 @@ public:
mTLS = nsnull;
}
AutoMarkingPtr* GetNext() {return mNext;}
virtual void MarkBeforeJSFinalize(JSContext* cx) = 0;
virtual void MarkAfterJSFinalize() = 0;

13
js/src/xpconnect/src/xpcthreadcontext.cpp
View File

@ -416,6 +416,19 @@ xpc_ThreadDataDtorCB(void* ptr)
void XPCPerThreadData::MarkAutoRootsBeforeJSFinalize(JSContext* cx)
{
#ifdef XPC_TRACK_AUTOMARKINGPTR_STATS
{
static int maxLength = 0;
int length = 0;
for(AutoMarkingPtr* p = mAutoRoots; p; p = p->GetNext())
length++;
if(length > maxLength)
maxLength = length;
printf("XPC gc on thread %x with %d AutoMarkingPtrs (%d max so far)\n",
this, length, maxLength);
}
#endif
if(mAutoRoots)
mAutoRoots->MarkBeforeJSFinalize(cx);
}

47
js/src/xpconnect/src/xpcwrappednative.cpp
View File

@ -2148,6 +2148,53 @@ NS_IMETHODIMP XPCWrappedNative::FindInterfaceWithName(jsval name, nsIInterfaceIn
return NS_OK;
}
inline nsresult UnexpectedFailure(nsresult rv)
{
NS_ERROR("This is not supposed to fail!");
return rv;
}
/* void refreshPrototype (); */
NS_IMETHODIMP XPCWrappedNative::RefreshPrototype()
{
XPCCallContext ccx(NATIVE_CALLER);
if(!ccx.IsValid())
return UnexpectedFailure(NS_ERROR_FAILURE);
if(!HasProto())
return NS_OK;
if(!GetFlatJSObject())
return UnexpectedFailure(NS_ERROR_FAILURE);
AutoMarkingWrappedNativeProtoPtr oldProto(ccx);
AutoMarkingWrappedNativeProtoPtr newProto(ccx);
oldProto = GetProto();
XPCNativeScriptableCreateInfo ci(*oldProto->GetScriptableInfo());
newProto = XPCWrappedNativeProto::GetNewOrUsed(ccx, oldProto->GetScope(),
oldProto->GetClassInfo(),
&ci,
!oldProto->IsShared());
if(!newProto)
return UnexpectedFailure(NS_ERROR_FAILURE);
// If nothing needs to change then we're done.
if(newProto.get() == oldProto.get())
return NS_OK;
if(!JS_SetPrototype(ccx, GetFlatJSObject(), newProto->GetJSProtoObject()))
return UnexpectedFailure(NS_ERROR_FAILURE);
mMaybeProto = newProto;
if(mScriptableInfo == oldProto->GetScriptableInfo())
mScriptableInfo = newProto->GetScriptableInfo();
return NS_OK;
}
/* void debugDump (in short depth); */
NS_IMETHODIMP XPCWrappedNative::DebugDump(PRInt16 depth)
{

9
js/src/xpconnect/src/xpcwrappednativeproto.cpp
View File

@ -115,8 +115,15 @@ XPCWrappedNativeProto::JSProtoObjectFinalized(JSContext *cx, JSObject *obj)
// Map locking is not necessary since we are running gc.
if(IsShared())
GetScope()->GetWrappedNativeProtoMap()->Remove(mClassInfo);
{
// Only remove this proto from the map if it is the one in the map.
ClassInfo2WrappedNativeProtoMap* map =
GetScope()->GetWrappedNativeProtoMap();
if(map->Find(mClassInfo) == this)
map->Remove(mClassInfo);
}
GetRuntime()->GetDetachedWrappedNativeProtoMap()->Remove(this);
GetRuntime()->GetDyingWrappedNativeProtoMap()->Add(this);
mJSProtoObject = nsnull;

23
js/src/xpconnect/src/xpcwrappednativescope.cpp
View File

@ -608,6 +608,29 @@ XPCWrappedNativeScope::ClearAllWrappedNativeSecurityPolicies(XPCCallContext& ccx
return NS_OK;
}
JS_STATIC_DLL_CALLBACK(JSDHashOperator)
WNProtoRemover(JSDHashTable *table, JSDHashEntryHdr *hdr,
uint32 number, void *arg)
{
XPCWrappedNativeProtoMap* detachedMap = (XPCWrappedNativeProtoMap*)arg;
XPCWrappedNativeProto* proto = (XPCWrappedNativeProto*)
((ClassInfo2WrappedNativeProtoMap::Entry*)hdr)->value;
detachedMap->Add(proto);
return JS_DHASH_REMOVE;
}
void
XPCWrappedNativeScope::RemoveWrappedNativeProtos()
{
XPCAutoLock al(mRuntime->GetMapLock());
mWrappedNativeProtoMap->Enumerate(WNProtoRemover,
GetRuntime()->GetDetachedWrappedNativeProtoMap());
}
/***************************************************************************/
// static