relanding part of 407442.
git-svn-id: svn://10.0.0.236/trunk@241831 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -996,7 +996,7 @@ protected:
|
||||
// won't be collected
|
||||
PRUint32 mMarkedCCGeneration;
|
||||
|
||||
nsTObserverArray<nsIPresShell> mPresShells;
|
||||
nsTObserverArray<nsIPresShell*> mPresShells;
|
||||
|
||||
nsCOMArray<nsINode> mSubtreeModifiedTargets;
|
||||
PRUint32 mSubtreeModifiedDepth;
|
||||
|
||||
@@ -564,7 +564,7 @@ public:
|
||||
/**
|
||||
* A list of mutation observers
|
||||
*/
|
||||
nsTObserverArray<nsIMutationObserver> mMutationObservers;
|
||||
nsTObserverArray<nsIMutationObserver*> mMutationObservers;
|
||||
|
||||
/**
|
||||
* An object implementing nsIDOMNodeList for this content (childNodes)
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user