From 599238cebeaa7fdff5915702fc4bc5df5f1eed96 Mon Sep 17 00:00:00 2001 From: "dbaron%fas.harvard.edu" Date: Fri, 5 Oct 2001 20:41:04 +0000 Subject: [PATCH] Backing out waterson's changes for 100952 to fix smoketest blocker 103331. r=waterson --- content/xul/templates/src/nsXULContentBuilder.cpp | 6 ------ content/xul/templates/src/nsXULOutlinerBuilder.cpp | 6 ------ content/xul/templates/src/nsXULTreeBuilder.cpp | 6 ------ 3 files changed, 18 deletions(-) diff --git a/content/xul/templates/src/nsXULContentBuilder.cpp b/content/xul/templates/src/nsXULContentBuilder.cpp index 7d44984c6e5..849099071aa 100644 --- a/content/xul/templates/src/nsXULContentBuilder.cpp +++ b/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 */); } diff --git a/content/xul/templates/src/nsXULOutlinerBuilder.cpp b/content/xul/templates/src/nsXULOutlinerBuilder.cpp index b7158f7ddb3..08228d35d8b 100644 --- a/content/xul/templates/src/nsXULOutlinerBuilder.cpp +++ b/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(); diff --git a/content/xul/templates/src/nsXULTreeBuilder.cpp b/content/xul/templates/src/nsXULTreeBuilder.cpp index b7158f7ddb3..08228d35d8b 100644 --- a/content/xul/templates/src/nsXULTreeBuilder.cpp +++ b/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();