relanding part of 407442.

git-svn-id: svn://10.0.0.236/trunk@241831 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dwitte%stanford.edu
2007-12-20 07:30:06 +00:00
parent 110f86e726
commit d62beece33
17 changed files with 378 additions and 264 deletions

View File

@@ -996,7 +996,7 @@ protected:
// won't be collected
PRUint32 mMarkedCCGeneration;
nsTObserverArray<nsIPresShell> mPresShells;
nsTObserverArray<nsIPresShell*> mPresShells;
nsCOMArray<nsINode> mSubtreeModifiedTargets;
PRUint32 mSubtreeModifiedDepth;

View File

@@ -564,7 +564,7 @@ public:
/**
* A list of mutation observers
*/
nsTObserverArray<nsIMutationObserver> mMutationObservers;
nsTObserverArray<nsIMutationObserver*> mMutationObservers;
/**
* An object implementing nsIDOMNodeList for this content (childNodes)

View File

@@ -42,17 +42,17 @@
#include "nsIDocument.h"
class nsPresShellIterator :
private nsTObserverArray<nsIPresShell>::ForwardIterator
private nsTObserverArray<nsIPresShell*>::ForwardIterator
{
public:
nsPresShellIterator(nsIDocument* aDoc)
: nsTObserverArray<nsIPresShell>::ForwardIterator(aDoc->mPresShells),
: nsTObserverArray<nsIPresShell*>::ForwardIterator(aDoc->mPresShells),
mDoc(aDoc) {}
already_AddRefed<nsIPresShell> GetNextShell()
{
nsIPresShell* shell = nsnull;
if (!mDoc->ShellsAreHidden()) {
if (!mDoc->ShellsAreHidden() && HasMore()) {
shell = GetNext();
NS_IF_ADDREF(shell);
}