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

Bug 776536 part 2. Rename nsTreeWalker to mozilla::dom::TreeWalker. r=peterv

Browse Source 
--HG--
rename : content/base/src/nsTreeWalker.cpp => content/base/src/TreeWalker.cpp
rename : content/base/src/nsTreeWalker.h => content/base/src/TreeWalker.h
This commit is contained in:
Boris Zbarsky 2013-02-28 12:56:41 -05:00
parent 8f02848ab6
commit 51b79f1f61
4 changed files with 54 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/base/src/Makefile.in
View File

@ -53,6 +53,7 @@ EXPORTS_mozilla/dom = \
Link.h \
NodeIterator.h \
Text.h \
TreeWalker.h \
$(NULL)
CPPSRCS = \
@ -127,7 +128,7 @@ CPPSRCS = \
nsTextNode.cpp \
nsTraversal.cpp \
nsTreeSanitizer.cpp \
nsTreeWalker.cpp \
TreeWalker.cpp \
nsViewportInfo.cpp \
WebSocket.cpp \
nsXHTMLContentSerializer.cpp \

60
content/base/src/nsTreeWalker.cpp → content/base/src/TreeWalker.cpp
View File

@ -8,7 +8,7 @@
* Implementation of DOM Traversal's nsIDOMTreeWalker
*/
#include "nsTreeWalker.h"
#include "mozilla/dom/TreeWalker.h"
#include "nsIDOMNode.h"
#include "nsIDOMNodeFilter.h"
@ -18,21 +18,24 @@
#include "nsContentUtils.h"
#include "mozilla/dom/NodeFilterBinding.h"
using namespace mozilla::dom;
DOMCI_DATA(TreeWalker, mozilla::dom::TreeWalker)
namespace mozilla {
namespace dom {
/*
* Factories, constructors and destructors
*/
nsTreeWalker::nsTreeWalker(nsINode *aRoot,
uint32_t aWhatToShow,
const NodeFilterHolder &aFilter) :
TreeWalker::TreeWalker(nsINode *aRoot,
uint32_t aWhatToShow,
const NodeFilterHolder &aFilter) :
nsTraversal(aRoot, aWhatToShow, aFilter),
mCurrentNode(aRoot)
{
}
nsTreeWalker::~nsTreeWalker()
TreeWalker::~TreeWalker()
{
/* destructor code */
}
@ -41,19 +44,17 @@ nsTreeWalker::~nsTreeWalker()
* nsISupports and cycle collection stuff
*/
NS_IMPL_CYCLE_COLLECTION_3(nsTreeWalker, mFilter, mCurrentNode, mRoot)
NS_IMPL_CYCLE_COLLECTION_3(TreeWalker, mFilter, mCurrentNode, mRoot)
DOMCI_DATA(TreeWalker, nsTreeWalker)
// QueryInterface implementation for nsTreeWalker
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsTreeWalker)
// QueryInterface implementation for TreeWalker
NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(TreeWalker)
NS_INTERFACE_MAP_ENTRY(nsIDOMTreeWalker)
NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsIDOMTreeWalker)
NS_DOM_INTERFACE_MAP_ENTRY_CLASSINFO(TreeWalker)
NS_INTERFACE_MAP_END
NS_IMPL_CYCLE_COLLECTING_ADDREF(nsTreeWalker)
NS_IMPL_CYCLE_COLLECTING_RELEASE(nsTreeWalker)
NS_IMPL_CYCLE_COLLECTING_ADDREF(TreeWalker)
NS_IMPL_CYCLE_COLLECTING_RELEASE(TreeWalker)
@ -62,7 +63,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(nsTreeWalker)
*/
/* readonly attribute nsIDOMNode root; */
NS_IMETHODIMP nsTreeWalker::GetRoot(nsIDOMNode * *aRoot)
NS_IMETHODIMP TreeWalker::GetRoot(nsIDOMNode * *aRoot)
{
if (mRoot) {
return CallQueryInterface(mRoot, aRoot);
@ -74,14 +75,14 @@ NS_IMETHODIMP nsTreeWalker::GetRoot(nsIDOMNode * *aRoot)
}
/* readonly attribute unsigned long whatToShow; */
NS_IMETHODIMP nsTreeWalker::GetWhatToShow(uint32_t *aWhatToShow)
NS_IMETHODIMP TreeWalker::GetWhatToShow(uint32_t *aWhatToShow)
{
*aWhatToShow = mWhatToShow;
return NS_OK;
}
/* readonly attribute nsIDOMNodeFilter filter; */
NS_IMETHODIMP nsTreeWalker::GetFilter(nsIDOMNodeFilter * *aFilter)
NS_IMETHODIMP TreeWalker::GetFilter(nsIDOMNodeFilter * *aFilter)
{
NS_ENSURE_ARG_POINTER(aFilter);
@ -91,7 +92,7 @@ NS_IMETHODIMP nsTreeWalker::GetFilter(nsIDOMNodeFilter * *aFilter)
}
/* attribute nsIDOMNode currentNode; */
NS_IMETHODIMP nsTreeWalker::GetCurrentNode(nsIDOMNode * *aCurrentNode)
NS_IMETHODIMP TreeWalker::GetCurrentNode(nsIDOMNode * *aCurrentNode)
{
if (mCurrentNode) {
return CallQueryInterface(mCurrentNode, aCurrentNode);
@ -101,7 +102,7 @@ NS_IMETHODIMP nsTreeWalker::GetCurrentNode(nsIDOMNode * *aCurrentNode)
return NS_OK;
}
NS_IMETHODIMP nsTreeWalker::SetCurrentNode(nsIDOMNode * aCurrentNode)
NS_IMETHODIMP TreeWalker::SetCurrentNode(nsIDOMNode * aCurrentNode)
{
NS_ENSURE_TRUE(aCurrentNode, NS_ERROR_DOM_NOT_SUPPORTED_ERR);
NS_ENSURE_TRUE(mRoot, NS_ERROR_UNEXPECTED);
@ -121,7 +122,7 @@ NS_IMETHODIMP nsTreeWalker::SetCurrentNode(nsIDOMNode * aCurrentNode)
*/
/* nsIDOMNode parentNode (); */
NS_IMETHODIMP nsTreeWalker::ParentNode(nsIDOMNode **_retval)
NS_IMETHODIMP TreeWalker::ParentNode(nsIDOMNode **_retval)
{
*_retval = nullptr;
@ -147,31 +148,31 @@ NS_IMETHODIMP nsTreeWalker::ParentNode(nsIDOMNode **_retval)
}
/* nsIDOMNode firstChild (); */
NS_IMETHODIMP nsTreeWalker::FirstChild(nsIDOMNode **_retval)
NS_IMETHODIMP TreeWalker::FirstChild(nsIDOMNode **_retval)
{
return FirstChildInternal(false, _retval);
}
/* nsIDOMNode lastChild (); */
NS_IMETHODIMP nsTreeWalker::LastChild(nsIDOMNode **_retval)
NS_IMETHODIMP TreeWalker::LastChild(nsIDOMNode **_retval)
{
return FirstChildInternal(true, _retval);
}
/* nsIDOMNode previousSibling (); */
NS_IMETHODIMP nsTreeWalker::PreviousSibling(nsIDOMNode **_retval)
NS_IMETHODIMP TreeWalker::PreviousSibling(nsIDOMNode **_retval)
{
return NextSiblingInternal(true, _retval);
}
/* nsIDOMNode nextSibling (); */
NS_IMETHODIMP nsTreeWalker::NextSibling(nsIDOMNode **_retval)
NS_IMETHODIMP TreeWalker::NextSibling(nsIDOMNode **_retval)
{
return NextSiblingInternal(false, _retval);
}
/* nsIDOMNode previousNode (); */
NS_IMETHODIMP nsTreeWalker::PreviousNode(nsIDOMNode **_retval)
NS_IMETHODIMP TreeWalker::PreviousNode(nsIDOMNode **_retval)
{
nsresult rv;
int16_t filtered;
@ -221,7 +222,7 @@ NS_IMETHODIMP nsTreeWalker::PreviousNode(nsIDOMNode **_retval)
}
/* nsIDOMNode nextNode (); */
NS_IMETHODIMP nsTreeWalker::NextNode(nsIDOMNode **_retval)
NS_IMETHODIMP TreeWalker::NextNode(nsIDOMNode **_retval)
{
nsresult rv;
int16_t filtered = nsIDOMNodeFilter::FILTER_ACCEPT; // pre-init for inner loop
@ -280,7 +281,7 @@ NS_IMETHODIMP nsTreeWalker::NextNode(nsIDOMNode **_retval)
}
/*
* nsTreeWalker helper functions
* TreeWalker helper functions
*/
/*
@ -290,7 +291,7 @@ NS_IMETHODIMP nsTreeWalker::NextNode(nsIDOMNode **_retval)
* @param _retval Returned node. Null if no child is found
* @returns Errorcode
*/
nsresult nsTreeWalker::FirstChildInternal(bool aReversed, nsIDOMNode **_retval)
nsresult TreeWalker::FirstChildInternal(bool aReversed, nsIDOMNode **_retval)
{
nsresult rv;
int16_t filtered;
@ -352,7 +353,7 @@ nsresult nsTreeWalker::FirstChildInternal(bool aReversed, nsIDOMNode **_retval)
* @param _retval Returned node. Null if no child is found
* @returns Errorcode
*/
nsresult nsTreeWalker::NextSiblingInternal(bool aReversed, nsIDOMNode **_retval)
nsresult TreeWalker::NextSiblingInternal(bool aReversed, nsIDOMNode **_retval)
{
nsresult rv;
int16_t filtered;
@ -401,3 +402,6 @@ nsresult nsTreeWalker::NextSiblingInternal(bool aReversed, nsIDOMNode **_retval)
return NS_OK;
}
}
} // namespace dom
} // namespace mozilla

24
content/base/src/nsTreeWalker.h → content/base/src/TreeWalker.h
View File

@ -8,8 +8,8 @@
* Implementation of DOM Traversal's nsIDOMTreeWalker
*/
#ifndef nsTreeWalker_h___
#define nsTreeWalker_h___
#ifndef mozilla_dom_TreeWalker_h
#define mozilla_dom_TreeWalker_h
#include "nsIDOMTreeWalker.h"
#include "nsTraversal.h"
@ -21,18 +21,21 @@ class nsINode;
class nsIDOMNode;
class nsIDOMNodeFilter;
class nsTreeWalker : public nsIDOMTreeWalker, public nsTraversal
namespace mozilla {
namespace dom {
class TreeWalker : public nsIDOMTreeWalker, public nsTraversal
{
public:
NS_DECL_CYCLE_COLLECTING_ISUPPORTS
NS_DECL_NSIDOMTREEWALKER
nsTreeWalker(nsINode *aRoot,
uint32_t aWhatToShow,
const mozilla::dom::NodeFilterHolder &aFilter);
virtual ~nsTreeWalker();
TreeWalker(nsINode *aRoot,
uint32_t aWhatToShow,
const NodeFilterHolder &aFilter);
virtual ~TreeWalker();
NS_DECL_CYCLE_COLLECTION_CLASS(nsTreeWalker)
NS_DECL_CYCLE_COLLECTION_CLASS(TreeWalker)
private:
nsCOMPtr<nsINode> mCurrentNode;
@ -56,5 +59,8 @@ private:
nsresult NextSiblingInternal(bool aReversed, nsIDOMNode **_retval);
};
#endif
} // namespace dom
} // namespace mozilla
#endif // mozilla_dom_TreeWalker_h

10
content/base/src/nsDocument.cpp
View File

@ -56,9 +56,9 @@
#include "nsRange.h"
#include "nsIDOMText.h"
#include "nsIDOMComment.h"
#include "DocumentType.h"
#include "mozilla/dom/DocumentType.h"
#include "mozilla/dom/NodeIterator.h"
#include "nsTreeWalker.h"
#include "mozilla/dom/TreeWalker.h"
#include "nsIServiceManager.h"
@ -5417,7 +5417,7 @@ nsDocument::CreateTreeWalker(nsIDOMNode *aRoot,
already_AddRefed<nsIDOMTreeWalker>
nsIDocument::CreateTreeWalker(nsINode& aRoot, uint32_t aWhatToShow,
NodeFilter* aFilter,
mozilla::ErrorResult& rv) const
ErrorResult& rv) const
{
NodeFilterHolder holder(aFilter);
// We don't really know how to handle WebIDL callbacks yet, in
@ -5430,7 +5430,7 @@ nsIDocument::CreateTreeWalker(nsINode& aRoot, uint32_t aWhatToShow,
already_AddRefed<nsIDOMTreeWalker>
nsIDocument::CreateTreeWalker(nsINode& aRoot, uint32_t aWhatToShow,
const NodeFilterHolder& aFilter,
mozilla::ErrorResult& rv) const
ErrorResult& rv) const
{
nsINode* root = &aRoot;
nsresult res = nsContentUtils::CheckSameOrigin(this, root);
@ -5439,7 +5439,7 @@ nsIDocument::CreateTreeWalker(nsINode& aRoot, uint32_t aWhatToShow,
return nullptr;
}
nsRefPtr<nsTreeWalker> walker = new nsTreeWalker(root, aWhatToShow, aFilter);
nsRefPtr<TreeWalker> walker = new TreeWalker(root, aWhatToShow, aFilter);
return walker.forget();
}