This is a much better way to do it.

Given the obscene load on the linux32 test boxes, I've cancelled that push and repushed as linux64. https://tbpl.mozilla.org/?tree=Try&rev=7b06693a78f6

Arg, this was bitrotted by bug 810082. Trying again: https://tbpl.mozilla.org/?tree=Try&rev=7d8c080fe064

I'll just leave this here: 3.14 + MOZ_ASSERT(cx = nsContentUtils::GetCurrentJSContext());

(In reply to :Ms2ger from comment #5) > I'll just leave this here: > > 3.14 + MOZ_ASSERT(cx = nsContentUtils::GetCurrentJSContext()); Doh! Thanks Ms2ger. That explains the lone orange. ;-)

Actually, it's still an issue, because sometimes cx is the safe JS context. I'll fix that.

This should do it. Flagging mrbkap for review.

Comment on attachment 691517 [details] [diff] [review] Move XBL detection into nsContentUtils and remove filename hack. v3 Review of attachment 691517 [details] [diff] [review]: ----------------------------------------------------------------- I'm so happy to see this code die. ::: content/base/public/nsContentUtils.h @@ +199,5 @@ > static JSContext* GetContextFromDocument(nsIDocument *aDocument); > > static bool IsCallerChrome(); > + static bool IsCallerXBL(); > + Nit: nuke the extra newline here.