Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-01-31 19:10:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

setAdapterProto: now splices in wrapper's prototype, rather than replacing object's original prototype chain. seems to work fine.

Browse Source
This commit is contained in:
beard%netscape.com 1999-09-24 16:51:25 +00:00
parent 0d650e898c
commit 24a3e9d1a9
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/rhino/org/mozilla/javascript/ScriptRuntime.java
View File

@ -1928,12 +1928,11 @@ public class ScriptRuntime {
}
public static void setAdapterProto(Scriptable obj, Object adapter) {
Scriptable p = obj.getPrototype();
Scriptable oldProto = obj.getPrototype();
Scriptable scope = ScriptableObject.getTopLevelScope(obj);
if (p == null || p == ScriptableObject.getObjectPrototype(scope)) {
Scriptable wrapped = (Scriptable) Context.toObject(adapter, scope);
obj.setPrototype(wrapped);
}
Scriptable wrapped = (Scriptable) Context.toObject(adapter, scope);
obj.setPrototype(wrapped);
wrapped.setPrototype(oldProto);
}
public static Scriptable initVarObj(Context cx, Scriptable scope,

9
js/rhino/src/org/mozilla/javascript/ScriptRuntime.java
View File

@ -1928,12 +1928,11 @@ public class ScriptRuntime {
}
public static void setAdapterProto(Scriptable obj, Object adapter) {
Scriptable p = obj.getPrototype();
Scriptable oldProto = obj.getPrototype();
Scriptable scope = ScriptableObject.getTopLevelScope(obj);
if (p == null || p == ScriptableObject.getObjectPrototype(scope)) {
Scriptable wrapped = (Scriptable) Context.toObject(adapter, scope);
obj.setPrototype(wrapped);
}
Scriptable wrapped = (Scriptable) Context.toObject(adapter, scope);
obj.setPrototype(wrapped);
wrapped.setPrototype(oldProto);
}
public static Scriptable initVarObj(Context cx, Scriptable scope,