Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

In getByGetter/setBySetter with slot.delegateTo avoid potentially expensive checks for start type if this == start.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@142438 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
igor%mir2.org
2003-05-14 14:51:00 +00:00
parent 2561a35d1e
commit c903f0e328
1 changed files with 32 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
mozilla/js/rhino/src/org/mozilla/javascript/ScriptableObject.java
View File

@@ -179,30 +179,38 @@ public abstract class ScriptableObject implements Scriptable, Serializable,
}
private Object getByGetter(GetterSlot slot, Scriptable start) {
try {
if (slot.delegateTo == null) {
Object getterThis;
Object[] args;
if (slot.delegateTo == null) {
if (start != this) {
// Walk the prototype chain to find an appropriate
// object to invoke the getter on.
Class clazz = slot.getter.getDeclaringClass();
while (!clazz.isInstance(start)) {
start = start.getPrototype();
if (start == this) {
break;
}
if (start == null) {
start = this;
break;
}
}
return slot.getter.invoke(start, ScriptRuntime.emptyArgs);
}
Object[] args = { this };
return slot.getter.invoke(slot.delegateTo, args);
}
catch (InvocationTargetException e) {
throw WrappedException.wrapException(e);
}
catch (IllegalAccessException e) {
throw WrappedException.wrapException(e);
getterThis = start;
args = ScriptRuntime.emptyArgs;
} else {
getterThis = slot.delegateTo;
args = new Object[] { this };
}
try {
return slot.getter.invoke(getterThis, args);
} catch (InvocationTargetException e) {
throw WrappedException.wrapException(e);
} catch (IllegalAccessException e) {
throw WrappedException.wrapException(e);
}
}
/**
@@ -273,14 +281,19 @@ public abstract class ScriptableObject implements Scriptable, Serializable,
Object actualArg
= FunctionObject.convertArg(cx, start, value, desired);
if (slot.delegateTo == null) {
// Walk the prototype chain to find an appropriate
// object to invoke the setter on.
Class clazz = slot.setter.getDeclaringClass();
while (!clazz.isInstance(start)) {
start = start.getPrototype();
if (start == null) {
start = this;
break;
if (start != this) {
// Walk the prototype chain to find an appropriate
// object to invoke the setter on.
Class clazz = slot.setter.getDeclaringClass();
while (!clazz.isInstance(start)) {
start = start.getPrototype();
if (start == this) {
break;
}
if (start == null) {
start = this;
break;
}
}
}
setterThis = start;