Backing out waterson's changes for 100952 to fix smoketest blocker 103331. r=waterson

content/xul/templates/src/nsXULContentBuilder.cpp

@@ -1771,12 +1771,6 @@ nsXULContentBuilder::CreateContents(nsIContent* aElement)
 
     NS_ASSERTION(IsElementInWidget(aElement), "element not managed by this template builder");
 
-    // Prevent re-entrancy while we're creating an element's children
-    if (mIsBuilding)
-        return NS_OK;
-
-    AutoLatch latch(&mIsBuilding);
-
     return CreateTemplateAndContainerContents(aElement, nsnull /* don't care */, nsnull /* don't care */);
 }
 

content/xul/templates/src/nsXULOutlinerBuilder.cpp

@@ -941,12 +941,6 @@ nsXULOutlinerBuilder::Rebuild()
     if (! mRoot)
         return NS_ERROR_NOT_INITIALIZED;
 
-    // Forbid re-entrancy while rebuilding
-    if (mIsBuilding)
-        return NS_OK;
-
-    AutoLatch latch(&mIsBuilding);
-
     nsresult rv;
 
     mRows.Clear();

content/xul/templates/src/nsXULTreeBuilder.cpp

@@ -941,12 +941,6 @@ nsXULOutlinerBuilder::Rebuild()
     if (! mRoot)
         return NS_ERROR_NOT_INITIALIZED;
 
-    // Forbid re-entrancy while rebuilding
-    if (mIsBuilding)
-        return NS_OK;
-
-    AutoLatch latch(&mIsBuilding);
-
     nsresult rv;
 
     mRows.Clear();