Backed out changeset 491237dbcb5d (bug 1323207)

Author: Archaeopteryx

dom/base/nsContentUtils.cpp

@@ -6743,8 +6743,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());

dom/base/nsImageLoadingContent.cpp

@@ -44,7 +44,6 @@
 
 #include "mozAutoDocUpdate.h"
 #include "mozilla/AsyncEventDispatcher.h"
-#include "mozilla/CycleCollectedJSContext.h"
 #include "mozilla/EventStates.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/ImageTracker.h"
@@ -149,9 +148,6 @@ nsImageLoadingContent::Notify(imgIRequest* aRequest,
   }
 
   {
-    MOZ_RELEASE_ASSERT(js::AllowGCBarriers(CycleCollectedJSContext::Get()->Context()),
-                       "ImageObservers can be implement in JS, so they should not be called during painting. See bug 1311841");
-
     nsAutoScriptBlocker scriptBlocker;
 
     for (ImageObserver* observer = &mObserverList, *next; observer;

xpcom/ds/nsObserverList.cpp

@@ -10,7 +10,6 @@
 #include "nsCOMArray.h"
 #include "nsISimpleEnumerator.h"
 #include "xpcpublic.h"
-#include "mozilla/CycleCollectedJSContext.h"
 
 nsresult
 nsObserverList::AddObserver(nsIObserver* anObserver, bool ownsWeak)
@@ -106,9 +105,6 @@ nsObserverList::NotifyObservers(nsISupports* aSubject,
                                 const char* aTopic,
                                 const char16_t* someData)
 {
-  MOZ_RELEASE_ASSERT(js::AllowGCBarriers(CycleCollectedJSContext::Get()->Context()),
-                     "Observers can be implement in JS, so they should not be called during painting.");
-
   nsCOMArray<nsIObserver> observers;
   FillObserverArray(observers);