From daf66655b1d69f5985faae764a117e7fc7a9cdff Mon Sep 17 00:00:00 2001 From: "bent.mozilla%gmail.com" Date: Tue, 9 Oct 2007 20:18:44 +0000 Subject: [PATCH] Oops, removing windows line endings I accidentally checked in when fixing bug 399094. git-svn-id: svn://10.0.0.236/trunk@237478 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/xpconnect/src/XPCWrapper.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mozilla/js/src/xpconnect/src/XPCWrapper.cpp b/mozilla/js/src/xpconnect/src/XPCWrapper.cpp index ed1ac34a9ba..a5375432e4a 100644 --- a/mozilla/js/src/xpconnect/src/XPCWrapper.cpp +++ b/mozilla/js/src/xpconnect/src/XPCWrapper.cpp @@ -167,16 +167,16 @@ XPCWrapper::NewResolve(JSContext *cx, JSObject *wrapperObj, } JSBool isXOW = (JS_GET_CLASS(cx, wrapperObj) == &sXPC_XOW_JSClass.base); - uintN attrs = JSPROP_ENUMERATE; - if (OBJ_IS_NATIVE(innerObjp)) { - JSScopeProperty *sprop = reinterpret_cast(prop); - attrs = sprop->attrs; - if ((preserveVal || isXOW) && - SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(innerObjp))) { - v = OBJ_GET_SLOT(cx, innerObjp, sprop->slot); - } - } - + uintN attrs = JSPROP_ENUMERATE; + if (OBJ_IS_NATIVE(innerObjp)) { + JSScopeProperty *sprop = reinterpret_cast(prop); + attrs = sprop->attrs; + if ((preserveVal || isXOW) && + SPROP_HAS_VALID_SLOT(sprop, OBJ_SCOPE(innerObjp))) { + v = OBJ_GET_SLOT(cx, innerObjp, sprop->slot); + } + } + OBJ_DROP_PROPERTY(cx, innerObjp, prop); // Hack alert: we only do this for same-origin calls on XOWs: we want