From 74b1942aeef6893fffbcec53e233ef2aeafd8bbf Mon Sep 17 00:00:00 2001 From: "bsmedberg%covad.net" Date: Wed, 4 Jun 2003 13:10:02 +0000 Subject: [PATCH] Bug 208111 - Remove nsIDocument::GetArena which is unused. r=sicking sr=peterv git-svn-id: svn://10.0.0.236/trunk@143286 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/base/public/nsIDocument.h | 6 ------ mozilla/content/base/src/nsDocument.cpp | 19 ++----------------- mozilla/content/base/src/nsDocument.h | 4 ---- 3 files changed, 2 insertions(+), 27 deletions(-) diff --git a/mozilla/content/base/public/nsIDocument.h b/mozilla/content/base/public/nsIDocument.h index ed6f89e95db..4b95be955db 100644 --- a/mozilla/content/base/public/nsIDocument.h +++ b/mozilla/content/base/public/nsIDocument.h @@ -45,7 +45,6 @@ #include "nsCOMArray.h" class nsIAtom; -class nsIArena; class nsIContent; class nsIDocumentObserver; class nsIPresContext; @@ -103,11 +102,6 @@ class nsIDocument : public nsISupports { public: NS_DEFINE_STATIC_IID_ACCESSOR(NS_IDOCUMENT_IID) - // All documents have a memory arena associated with them which is - // used for memory allocation during document creation. This call - // returns the arena associated with this document. - NS_IMETHOD GetArena(nsIArena** aArena) = 0; - NS_IMETHOD StartDocumentLoad(const char* aCommand, nsIChannel* aChannel, nsILoadGroup* aLoadGroup, diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp index a29621fd27f..10d69dfa3f9 100644 --- a/mozilla/content/base/src/nsDocument.cpp +++ b/mozilla/content/base/src/nsDocument.cpp @@ -44,7 +44,6 @@ #include "nsIInterfaceRequestor.h" #include "nsIInterfaceRequestorUtils.h" #include "nsDocument.h" -#include "nsIArena.h" #include "nsUnicharUtils.h" #include "nsIPrivateDOMEvent.h" #include "nsIEventStateManager.h" @@ -638,28 +637,14 @@ NS_IMPL_RELEASE(nsDocument) nsresult nsDocument::Init() { - if (mArena) { + if (mNodeInfoManager) { return NS_ERROR_ALREADY_INITIALIZED; } - nsresult rv = NS_NewHeapArena(getter_AddRefs(mArena), nsnull); - NS_ENSURE_SUCCESS(rv, rv); - mNodeInfoManager = new nsNodeInfoManager(); NS_ENSURE_TRUE(mNodeInfoManager, NS_ERROR_OUT_OF_MEMORY); - mNodeInfoManager->Init(this); - - return rv; -} - -NS_IMETHODIMP -nsDocument::GetArena(nsIArena** aArena) -{ - *aArena = mArena; - NS_IF_ADDREF(*aArena); - - return NS_OK; + return mNodeInfoManager->Init(this); } NS_IMETHODIMP diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h index 944f59c8524..55df5289f54 100644 --- a/mozilla/content/base/src/nsDocument.h +++ b/mozilla/content/base/src/nsDocument.h @@ -44,7 +44,6 @@ #include "nsIDocument.h" #include "nsWeakReference.h" #include "nsWeakPtr.h" -#include "nsIArena.h" #include "nsVoidArray.h" #include "nsIDOMXMLDocument.h" #include "nsIDOMDocumentView.h" @@ -243,8 +242,6 @@ public: NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW - NS_IMETHOD GetArena(nsIArena** aArena); - NS_IMETHOD Reset(nsIChannel* aChannel, nsILoadGroup* aLoadGroup); NS_IMETHOD ResetToURI(nsIURI *aURI, nsILoadGroup *aLoadGroup); @@ -598,7 +595,6 @@ protected: nsDocument(); virtual ~nsDocument(); - nsCOMPtr mArena; nsString mDocumentTitle; nsCString mLastModified; nsCOMPtr mDocumentURL;