mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Fix for bug 804732 (Remove mCachedDOMPrototypes). r=bz.
--HG-- extra : rebase_source : dc9ffe5f37dbc0542cbb47384b2d25472c70d801
This commit is contained in:
parent
a05110d6d7
commit
c4a61ef363
@ -384,8 +384,6 @@ XPCWrappedNativeScope::StartFinalizationPhaseOfGC(JSFreeOp *fop, XPCJSRuntime* r
|
||||
if (cur->mGlobalJSObject &&
|
||||
JS_IsAboutToBeFinalized(cur->mGlobalJSObject)) {
|
||||
cur->mGlobalJSObject.finalize(fop->runtime());
|
||||
if (cur->GetCachedDOMPrototypes().IsInitialized())
|
||||
cur->GetCachedDOMPrototypes().Clear();
|
||||
// Move this scope from the live list to the dying list.
|
||||
if (prev)
|
||||
prev->mNext = next;
|
||||
@ -660,22 +658,6 @@ XPCWrappedNativeScope::RemoveWrappedNativeProtos()
|
||||
GetRuntime()->GetDetachedWrappedNativeProtoMap());
|
||||
}
|
||||
|
||||
static PLDHashOperator
|
||||
TraceDOMPrototype(const char* aKey, JSObject* aData, void* aClosure)
|
||||
{
|
||||
JSTracer *trc = static_cast<JSTracer*>(aClosure);
|
||||
JS_CALL_OBJECT_TRACER(trc, aData, "DOM prototype");
|
||||
return PL_DHASH_NEXT;
|
||||
}
|
||||
|
||||
void
|
||||
XPCWrappedNativeScope::TraceDOMPrototypes(JSTracer *trc)
|
||||
{
|
||||
if (mCachedDOMPrototypes.IsInitialized()) {
|
||||
mCachedDOMPrototypes.EnumerateRead(TraceDOMPrototype, trc);
|
||||
}
|
||||
}
|
||||
|
||||
/***************************************************************************/
|
||||
|
||||
// static
|
||||
|
@ -1026,9 +1026,6 @@ TraceXPCGlobal(JSTracer *trc, JSObject *obj)
|
||||
}
|
||||
#endif
|
||||
|
||||
if (XPCWrappedNativeScope *scope = GetObjectScope(obj))
|
||||
scope->TraceDOMPrototypes(trc);
|
||||
|
||||
if (js::GetObjectClass(obj)->flags & JSCLASS_DOM_GLOBAL)
|
||||
mozilla::dom::TraceProtoOrIfaceCache(trc, obj);
|
||||
}
|
||||
|
@ -1697,13 +1697,6 @@ public:
|
||||
XPCContext *GetContext() { return mContext; }
|
||||
void ClearContext() { mContext = nullptr; }
|
||||
|
||||
nsDataHashtable<nsDepCharHashKey, JSObject*>& GetCachedDOMPrototypes()
|
||||
{
|
||||
return mCachedDOMPrototypes;
|
||||
}
|
||||
|
||||
void TraceDOMPrototypes(JSTracer *trc);
|
||||
|
||||
JSBool ExperimentalBindingsEnabled()
|
||||
{
|
||||
return mExperimentalBindingsEnabled;
|
||||
@ -1755,7 +1748,6 @@ private:
|
||||
|
||||
XPCContext* mContext;
|
||||
|
||||
nsDataHashtable<nsDepCharHashKey, JSObject*> mCachedDOMPrototypes;
|
||||
nsAutoPtr<DOMExpandoMap> mDOMExpandoMap;
|
||||
|
||||
JSBool mExperimentalBindingsEnabled;
|
||||
|
Loading…
Reference in New Issue
Block a user