Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1260651 part.6 Rename nsDOMIterator to mozilla::DOMIterator r=mccr8

Browse Source 
MozReview-Commit-ID: 6wBVUivS4xY
This commit is contained in:
Masayuki Nakano 2016-06-23 17:30:39 +09:00
parent 2997e5fed4
commit 111252de4a
3 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editor/libeditor/EditorUtils.cpp
View File

@ -63,12 +63,13 @@ nsAutoSelectionReset::Abort()
mEd->StopPreservingSelection();
}
namespace mozilla {
/******************************************************************************
* some helper classes for iterating the dom tree
*****************************************************************************/
nsDOMIterator::nsDOMIterator(nsINode& aNode MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL)
DOMIterator::DOMIterator(nsINode& aNode MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_IMPL)
{
MOZ_GUARD_OBJECT_NOTIFIER_INIT;
mIter = NS_NewContentIterator();
@ -77,24 +78,24 @@ nsDOMIterator::nsDOMIterator(nsINode& aNode MOZ_GUARD_OBJECT_NOTIFIER_PARAM_IN_I
}
nsresult
nsDOMIterator::Init(nsRange& aRange)
DOMIterator::Init(nsRange& aRange)
{
mIter = NS_NewContentIterator();
return mIter->Init(&aRange);
}
nsDOMIterator::nsDOMIterator(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_IN_IMPL)
DOMIterator::DOMIterator(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_IN_IMPL)
{
MOZ_GUARD_OBJECT_NOTIFIER_INIT;
}
nsDOMIterator::~nsDOMIterator()
DOMIterator::~DOMIterator()
{
}
void
nsDOMIterator::AppendList(const nsBoolDomIterFunctor& functor,
nsTArray<OwningNonNull<nsINode>>& arrayOfNodes) const
DOMIterator::AppendList(const nsBoolDomIterFunctor& functor,
nsTArray<OwningNonNull<nsINode>>& arrayOfNodes) const
{
// Iterate through dom and build list
for (; !mIter->IsDone(); mIter->Next()) {
@ -106,11 +107,9 @@ nsDOMIterator::AppendList(const nsBoolDomIterFunctor& functor,
}
}
namespace mozilla {
DOMSubtreeIterator::DOMSubtreeIterator(
MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_IN_IMPL)
: nsDOMIterator(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_TO_PARENT)
: DOMIterator(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM_TO_PARENT)
{
}

38
editor/libeditor/EditorUtils.h
View File

@ -199,26 +199,28 @@ class nsBoolDomIterFunctor
virtual bool operator()(nsINode* aNode) const = 0;
};
class MOZ_RAII nsDOMIterator
{
public:
explicit nsDOMIterator(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM);
explicit nsDOMIterator(nsINode& aNode MOZ_GUARD_OBJECT_NOTIFIER_PARAM);
virtual ~nsDOMIterator();
nsresult Init(nsRange& aRange);
void AppendList(const nsBoolDomIterFunctor& functor,
nsTArray<mozilla::OwningNonNull<nsINode>>& arrayOfNodes) const;
protected:
nsCOMPtr<nsIContentIterator> mIter;
MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
};
namespace mozilla {
class MOZ_RAII DOMSubtreeIterator final : public nsDOMIterator
class MOZ_RAII DOMIterator
{
public:
explicit DOMIterator(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM);
explicit DOMIterator(nsINode& aNode MOZ_GUARD_OBJECT_NOTIFIER_PARAM);
virtual ~DOMIterator();
nsresult Init(nsRange& aRange);
void AppendList(
const nsBoolDomIterFunctor& functor,
nsTArray<mozilla::OwningNonNull<nsINode>>& arrayOfNodes) const;
protected:
nsCOMPtr<nsIContentIterator> mIter;
MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER
};
class MOZ_RAII DOMSubtreeIterator final : public DOMIterator
{
public:
explicit DOMSubtreeIterator(MOZ_GUARD_OBJECT_NOTIFIER_ONLY_PARAM);

6
editor/libeditor/nsHTMLEditRules.cpp
View File

@ -4690,7 +4690,7 @@ nsHTMLEditRules::AlignInnerBlocks(nsINode& aNode, const nsAString* alignType)
// Gather list of table cells or list items
nsTArray<OwningNonNull<nsINode>> nodeArray;
nsTableCellAndListItemFunctor functor;
nsDOMIterator iter(aNode);
DOMIterator iter(aNode);
iter.AppendList(functor, nodeArray);
// Now that we have the list, align their contents as requested
@ -5955,7 +5955,7 @@ nsHTMLEditRules::BustUpInlinesAtBRs(nsIContent& aNode,
// First build up a list of all the break nodes inside the inline container.
nsTArray<OwningNonNull<nsINode>> arrayOfBreaks;
nsBRNodeFunctor functor;
nsDOMIterator iter(aNode);
DOMIterator iter(aNode);
iter.AppendList(functor, arrayOfBreaks);
// If there aren't any breaks, just put inNode itself in the array
@ -7111,7 +7111,7 @@ nsHTMLEditRules::AdjustSpecialBreaks()
// Gather list of empty nodes
nsTArray<OwningNonNull<nsINode>> nodeArray;
nsEmptyEditableFunctor functor(mHTMLEditor);
nsDOMIterator iter;
DOMIterator iter;
nsresult res = iter.Init(*mDocChangeRange);
NS_ENSURE_SUCCESS(res, );
iter.AppendList(functor, nodeArray);