Back out bug 1323207, part 2 - Assert early if we're painting at various points we enter JS (a=backout)

This reverts commit cc6bc31c9f3fb10877292b31c1cf26927856a837.

MozReview-Commit-ID: Dljoh4lYVZ9
This commit is contained in:
Bill McCloskey 2017-01-06 12:58:58 -08:00
parent 2e44d1fcd5
commit 8ebd98768a
2 changed files with 0 additions and 5 deletions

View File

@ -6748,8 +6748,6 @@ nsContentUtils::IsPatternMatching(nsAString& aValue, nsAString& aPattern,
jsapi.Init();
JSContext* cx = jsapi.cx();
MOZ_RELEASE_ASSERT(js::AllowGCBarriers(cx), "IsPatternMatching can enter the JS engine during painting. See bug 1310335.");
// We can use the junk scope here, because we're just using it for
// regexp evaluation, not actual script execution.
JSAutoCompartment ac(cx, xpc::UnprivilegedJunkScope());

View File

@ -31,9 +31,6 @@ ScriptedNotificationObserver::Notify(imgIRequest* aRequest,
int32_t aType,
const nsIntRect* /*aUnused*/)
{
MOZ_RELEASE_ASSERT(js::AllowGCBarriers(CycleCollectedJSContext::Get()->Context()),
"sending image notification to JS observer during painting. See bug 1311841");
if (aType == imgINotificationObserver::SIZE_AVAILABLE) {
return mInner->SizeAvailable(aRequest);
}