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

Bug 815468: BaseProxyHandler::iteratorNext is never used; delete it. r=luke

Browse Source
This commit is contained in:
Jim Blandy 2012-12-06 13:00:55 -08:00
parent 54519289b3
commit bd52abcd05
4 changed files with 0 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
js/src/jsproxy.cpp
View File

@ -325,13 +325,6 @@ BaseProxyHandler::defaultValue(JSContext *cx, JSObject *proxy, JSType hint,
return true;
}
bool
BaseProxyHandler::iteratorNext(JSContext *cx, JSObject *proxy, Value *vp)
{
vp->setMagic(JS_NO_ITER_VALUE);
return true;
}
bool
BaseProxyHandler::nativeCall(JSContext *cx, IsAcceptableThis test, NativeImpl impl, CallArgs args)
{
@ -526,23 +519,6 @@ DirectProxyHandler::defaultValue(JSContext *cx, JSObject *proxy, JSType hint,
return ToPrimitive(cx, hint, vp);
}
bool
DirectProxyHandler::iteratorNext(JSContext *cx, JSObject *proxy, Value *vp)
{
Rooted<JSObject*> target(cx, GetProxyTargetObject(proxy));
RootedValue value(cx);
if (!js_IteratorMore(cx, target, &value))
return false;
*vp = value;
if (vp->toBoolean()) {
*vp = cx->iterValue;
cx->iterValue = UndefinedValue();
} else {
*vp = MagicValue(JS_NO_ITER_VALUE);
}
return true;
}
JSObject *
DirectProxyHandler::weakmapKeyDelegate(JSObject *proxy)
{
@ -2537,14 +2513,6 @@ Proxy::defaultValue(JSContext *cx, JSObject *proxy_, JSType hint, Value *vp)
return GetProxyHandler(proxy)->defaultValue(cx, proxy, hint, vp);
}
bool
Proxy::iteratorNext(JSContext *cx, JSObject *proxy_, Value *vp)
{
JS_CHECK_RECURSION(cx, return false);
RootedObject proxy(cx, proxy_);
return GetProxyHandler(proxy)->iteratorNext(cx, proxy, vp);
}
bool
Proxy::getPrototypeOf(JSContext *cx, JSObject *proxy, JSObject **proto)
{

4
js/src/jsproxy.h
View File

@ -107,7 +107,6 @@ class JS_FRIEND_API(BaseProxyHandler) {
virtual JSString *fun_toString(JSContext *cx, JSObject *proxy, unsigned indent);
virtual bool regexp_toShared(JSContext *cx, JSObject *proxy, RegExpGuard *g);
virtual bool defaultValue(JSContext *cx, JSObject *obj, JSType hint, Value *vp);
virtual bool iteratorNext(JSContext *cx, JSObject *proxy, Value *vp);
virtual void finalize(JSFreeOp *fop, JSObject *proxy);
virtual bool getElementIfPresent(JSContext *cx, JSObject *obj, JSObject *receiver,
uint32_t index, Value *vp, bool *present);
@ -172,8 +171,6 @@ public:
RegExpGuard *g) MOZ_OVERRIDE;
virtual bool defaultValue(JSContext *cx, JSObject *obj, JSType hint,
Value *vp) MOZ_OVERRIDE;
virtual bool iteratorNext(JSContext *cx, JSObject *proxy,
Value *vp) MOZ_OVERRIDE;
virtual JSObject *weakmapKeyDelegate(JSObject *proxy);
};
@ -216,7 +213,6 @@ class Proxy {
static JSString *fun_toString(JSContext *cx, JSObject *proxy, unsigned indent);
static bool regexp_toShared(JSContext *cx, JSObject *proxy, RegExpGuard *g);
static bool defaultValue(JSContext *cx, JSObject *obj, JSType hint, Value *vp);
static bool iteratorNext(JSContext *cx, JSObject *proxy, Value *vp);
static bool getPrototypeOf(JSContext *cx, JSObject *proxy, JSObject **protop);
static JSObject * const LazyProto;

16
js/src/jswrapper.cpp
View File

@ -742,15 +742,6 @@ CrossCompartmentWrapper::defaultValue(JSContext *cx, JSObject *wrapper, JSType h
return cx->compartment->wrap(cx, vp);
}
bool
CrossCompartmentWrapper::iteratorNext(JSContext *cx, JSObject *wrapper, Value *vp)
{
PIERCE(cx, wrapper, GET,
NOTHING,
DirectProxyHandler::iteratorNext(cx, wrapper, vp),
cx->compartment->wrap(cx, vp));
}
bool
CrossCompartmentWrapper::getPrototypeOf(JSContext *cx, JSObject *proxy, JSObject **protop)
{
@ -940,13 +931,6 @@ DeadObjectProxy::defaultValue(JSContext *cx, JSObject *obj, JSType hint, Value *
return false;
}
bool
DeadObjectProxy::iteratorNext(JSContext *cx, JSObject *proxy, Value *vp)
{
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL, JSMSG_DEAD_OBJECT);
return false;
}
bool
DeadObjectProxy::getElementIfPresent(JSContext *cx, JSObject *obj, JSObject *receiver,
uint32_t index, Value *vp, bool *present)

2
js/src/jswrapper.h
View File

@ -160,7 +160,6 @@ class JS_FRIEND_API(CrossCompartmentWrapper) : public Wrapper
virtual JSString *fun_toString(JSContext *cx, JSObject *wrapper, unsigned indent) MOZ_OVERRIDE;
virtual bool regexp_toShared(JSContext *cx, JSObject *proxy, RegExpGuard *g) MOZ_OVERRIDE;
virtual bool defaultValue(JSContext *cx, JSObject *wrapper, JSType hint, Value *vp) MOZ_OVERRIDE;
virtual bool iteratorNext(JSContext *cx, JSObject *wrapper, Value *vp);
virtual bool getPrototypeOf(JSContext *cx, JSObject *proxy, JSObject **protop);
static CrossCompartmentWrapper singleton;
@ -220,7 +219,6 @@ class JS_FRIEND_API(DeadObjectProxy) : public BaseProxyHandler
virtual JSString *fun_toString(JSContext *cx, JSObject *proxy, unsigned indent);
virtual bool regexp_toShared(JSContext *cx, JSObject *proxy, RegExpGuard *g);
virtual bool defaultValue(JSContext *cx, JSObject *obj, JSType hint, Value *vp);
virtual bool iteratorNext(JSContext *cx, JSObject *proxy, Value *vp);
virtual bool getElementIfPresent(JSContext *cx, JSObject *obj, JSObject *receiver,
uint32_t index, Value *vp, bool *present);
virtual bool getPrototypeOf(JSContext *cx, JSObject *proxy, JSObject **protop);