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

Fix some stuff brendan pointed out.

Browse Source
This commit is contained in:
Blake Kaplan 2011-03-08 18:08:59 -08:00
parent 155ec564ef
commit cfa571b106
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/src/jscntxt.cpp
View File

@ -145,7 +145,6 @@ StackSegment::computeNextFrame(JSStackFrame *fp) const
JS_ASSERT(fp != getCurrentFrame());
JSStackFrame *next = getCurrentFrame();
JSStackFrame *end = getInitialFrame()->prev();
JSStackFrame *prev;
while ((prev = next->prev()) != fp)
next = prev;

12
js/src/jsproxy.cpp
View File

@ -151,7 +151,9 @@ JSProxyHandler::set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id,
if (desc.obj) {
if (desc.attrs & JSPROP_READONLY)
return true;
if (desc.setter && ((desc.attrs & JSPROP_SETTER) || desc.setter != StrictPropertyStub)) {
if (!desc.setter) {
desc.setter = StrictPropertyStub;
} else if ((desc.attrs & JSPROP_SETTER) || desc.setter != StrictPropertyStub) {
if (!CallSetter(cx, receiver, id, desc.setter, desc.attrs, desc.shortid, strict, vp))
return false;
if (!proxy->isProxy() || proxy->getProxyHandler() != this)
@ -161,8 +163,6 @@ JSProxyHandler::set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id,
}
if (!desc.getter)
desc.getter = PropertyStub;
if (!desc.setter)
desc.setter = StrictPropertyStub;
desc.value = *vp;
return defineProperty(cx, receiver, id, &desc);
}
@ -171,7 +171,9 @@ JSProxyHandler::set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id,
if (desc.obj) {
if (desc.attrs & JSPROP_READONLY)
return true;
if (desc.setter && ((desc.attrs & JSPROP_SETTER) || desc.setter != StrictPropertyStub)) {
if (!desc.setter) {
desc.setter = StrictPropertyStub;
} else if ((desc.attrs & JSPROP_SETTER) || desc.setter != StrictPropertyStub) {
if (!CallSetter(cx, receiver, id, desc.setter, desc.attrs, desc.shortid, strict, vp))
return false;
if (!proxy->isProxy() || proxy->getProxyHandler() != this)
@ -181,8 +183,6 @@ JSProxyHandler::set(JSContext *cx, JSObject *proxy, JSObject *receiver, jsid id,
}
if (!desc.getter)
desc.getter = PropertyStub;
if (!desc.setter)
desc.setter = StrictPropertyStub;
return defineProperty(cx, receiver, id, &desc);
}