From 8764808d8893a59b405556f89b4befcbd203968c Mon Sep 17 00:00:00 2001 From: "mrbkap%gmail.com" Date: Wed, 28 Nov 2007 01:09:31 +0000 Subject: [PATCH] Make XOW's toString consistent over all cases. bug 398109, r=jst sr=bzbarsky a=beltzner git-svn-id: svn://10.0.0.236/trunk@240011 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/js/src/xpconnect/src/XPCWrapper.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mozilla/js/src/xpconnect/src/XPCWrapper.cpp b/mozilla/js/src/xpconnect/src/XPCWrapper.cpp index a5375432e4a..efff4d1bc2c 100644 --- a/mozilla/js/src/xpconnect/src/XPCWrapper.cpp +++ b/mozilla/js/src/xpconnect/src/XPCWrapper.cpp @@ -637,8 +637,6 @@ XPCWrapper::NativeToString(JSContext *cx, XPCWrappedNative *wrappedNative, return JS_FALSE; } } else { - resultString.AppendLiteral("[object XPCCrossOriginWrapper "); - wrapperStr = wrappedNative->ToString(ccx); if (!wrapperStr) { return JS_FALSE; @@ -648,7 +646,9 @@ XPCWrapper::NativeToString(JSContext *cx, XPCWrappedNative *wrappedNative, resultString.AppendASCII(wrapperStr); JS_smprintf_free(wrapperStr); - resultString.Append(']'); + if (isNativeWrapper) { + resultString.Append(']'); + } str = ::JS_NewUCStringCopyN(cx, reinterpret_cast (resultString.get()),