corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backed out changeset 6403c45366e0 (bug 1257919)

Browse Source
This commit is contained in:
Sebastian Hengst
2016-03-22 21:10:55 +01:00
parent 8cdf264c0e
commit a68ab77d38
6 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dom/base/DOMException.cpp
View File

@@ -400,7 +400,7 @@ Exception::GetData(nsISupports** aData)
} }
NS_IMETHODIMP NS_IMETHODIMP
Exception::ToString(JSContext* aCx, nsACString& _retval) Exception::ToString(nsACString& _retval)
{ {
NS_ENSURE_TRUE(mInitialized, NS_ERROR_NOT_INITIALIZED); NS_ENSURE_TRUE(mInitialized, NS_ERROR_NOT_INITIALIZED);
@@ -413,7 +413,7 @@ Exception::ToString(JSContext* aCx, nsACString& _retval)
if (mLocation) { if (mLocation) {
// we need to free this if it does not fail // we need to free this if it does not fail
nsresult rv = mLocation->ToString(aCx, location); nsresult rv = mLocation->ToString(location);
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
} }
@@ -547,13 +547,13 @@ Exception::GetStack(nsAString& aStack, ErrorResult& aRv) const
} }
void void
Exception::Stringify(JSContext* aCx, nsString& retval) Exception::Stringify(nsString& retval)
{ {
nsCString str; nsCString str;
#ifdef DEBUG #ifdef DEBUG
DebugOnly<nsresult> rv = DebugOnly<nsresult> rv =
#endif #endif
ToString(aCx, str); ToString(str);
MOZ_ASSERT(NS_SUCCEEDED(rv)); MOZ_ASSERT(NS_SUCCEEDED(rv));
CopyUTF8toUTF16(str, retval); CopyUTF8toUTF16(str, retval);
} }
@@ -592,7 +592,7 @@ DOMException::GetCode(uint16_t* aCode)
} }
NS_IMETHODIMP NS_IMETHODIMP
DOMException::ToString(JSContext* aCx, nsACString& aReturn) DOMException::ToString(nsACString& aReturn)
{ {
aReturn.Truncate(); aReturn.Truncate();

4
dom/base/DOMException.h
View File

@@ -88,7 +88,7 @@ public:
void GetStack(nsAString& aStack, ErrorResult& aRv) const; void GetStack(nsAString& aStack, ErrorResult& aRv) const;
void Stringify(JSContext* aCx, nsString& retval); void Stringify(nsString& retval);
// XPCOM factory ctor. // XPCOM factory ctor.
Exception(); Exception();
@@ -131,7 +131,7 @@ public:
NS_DECL_NSIDOMDOMEXCEPTION NS_DECL_NSIDOMDOMEXCEPTION
// nsIException overrides // nsIException overrides
NS_IMETHOD ToString(JSContext* aCx, nsACString& aReturn) override; NS_IMETHOD ToString(nsACString& aReturn) override;
// nsWrapperCache overrides // nsWrapperCache overrides
virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)

1
dom/bindings/Bindings.conf
View File

@@ -478,7 +478,6 @@ DOMInterfaces = {
'binaryNames': { 'binaryNames': {
'message': 'messageMoz', 'message': 'messageMoz',
}, },
'implicitJSContext': [ '__stringifier' ],
}, },
'ExtendableEvent': { 'ExtendableEvent': {

2
dom/bindings/Exceptions.cpp
View File

@@ -763,7 +763,7 @@ NS_IMETHODIMP StackFrame::GetNativeSavedFrame(JS::MutableHandle<JS::Value> aSave
return NS_OK; return NS_OK;
} }
NS_IMETHODIMP StackFrame::ToString(JSContext* aCx, nsACString& _retval) NS_IMETHODIMP StackFrame::ToString(nsACString& _retval)
{ {
_retval.Truncate(); _retval.Truncate();

4
js/xpconnect/src/XPCWrappedJSClass.cpp
View File

@@ -878,7 +878,7 @@ nsXPCWrappedJSClass::CheckForException(XPCCallContext & ccx,
fputs(line, stdout); fputs(line, stdout);
fputs(preamble, stdout); fputs(preamble, stdout);
nsCString text; nsCString text;
if (NS_SUCCEEDED(xpc_exception->ToString(cx, text)) && if (NS_SUCCEEDED(xpc_exception->ToString(text)) &&
!text.IsEmpty()) { !text.IsEmpty()) {
fputs(text.get(), stdout); fputs(text.get(), stdout);
fputs("\n", stdout); fputs("\n", stdout);
@@ -905,7 +905,7 @@ nsXPCWrappedJSClass::CheckForException(XPCCallContext & ccx,
scriptError = do_CreateInstance(XPC_SCRIPT_ERROR_CONTRACTID); scriptError = do_CreateInstance(XPC_SCRIPT_ERROR_CONTRACTID);
if (nullptr != scriptError) { if (nullptr != scriptError) {
nsCString newMessage; nsCString newMessage;
rv = xpc_exception->ToString(cx, newMessage); rv = xpc_exception->ToString(newMessage);
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
// try to get filename, lineno from the first // try to get filename, lineno from the first
// stack frame location. // stack frame location.

2
xpcom/base/nsIException.idl
View File

@@ -35,7 +35,6 @@ interface nsIStackFrame : nsISupports
// or null if this is not a native JavaScript stack frame. // or null if this is not a native JavaScript stack frame.
readonly attribute jsval nativeSavedFrame; readonly attribute jsval nativeSavedFrame;
[implicit_jscontext]
AUTF8String toString(); AUTF8String toString();
}; };
@@ -71,6 +70,5 @@ interface nsIException : nsISupports
readonly attribute nsISupports data; readonly attribute nsISupports data;
// A generic formatter - make it suitable to print, etc. // A generic formatter - make it suitable to print, etc.
[implicit_jscontext]
AUTF8String toString(); AUTF8String toString();
}; };