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

Bug 1375502 - part3: Rename startNode of nsContentIterator::InitInternal() to aStartContainer r=mats

Browse Source 
MozReview-Commit-ID: 9fXIKhB03Mx

--HG--
extra : rebase_source : af2b3e77c6b27fa3f3f2986500cced550084ba47
This commit is contained in:
Masayuki Nakano 2017-08-16 22:11:11 +09:00
parent e3529fd155
commit 2ec6224014
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dom/base/nsContentIterator.cpp
View File

@ -344,20 +344,20 @@ nsContentIterator::Init(nsINode* aStartContainer, uint32_t aStartOffset,
// XXX Argument names will be replaced in the following patch.
nsresult
nsContentIterator::InitInternal(nsINode* startNode, uint32_t startIndx,
nsContentIterator::InitInternal(nsINode* aStartContainer, uint32_t startIndx,
nsINode* endNode, uint32_t endIndx)
{
// get common content parent
mCommonParent =
nsContentUtils::GetCommonAncestor(startNode, endNode);
nsContentUtils::GetCommonAncestor(aStartContainer, endNode);
if (NS_WARN_IF(!mCommonParent)) {
return NS_ERROR_FAILURE;
}
bool startIsData = startNode->IsNodeOfType(nsINode::eDATA_NODE);
bool startIsData = aStartContainer->IsNodeOfType(nsINode::eDATA_NODE);
// short circuit when start node == end node
if (startNode == endNode) {
if (aStartContainer == endNode) {
// Check to see if we have a collapsed range, if so, there is nothing to
// iterate over.
//
@ -372,7 +372,7 @@ nsContentIterator::InitInternal(nsINode* startNode, uint32_t startIndx,
if (startIsData) {
// It's a character data node.
mFirst = startNode->AsContent();
mFirst = aStartContainer->AsContent();
mLast = mFirst;
mCurNode = mFirst;
@ -388,8 +388,8 @@ nsContentIterator::InitInternal(nsINode* startNode, uint32_t startIndx,
// Valid start indices are 0 <= startIndx <= childCount. That means if start
// node has no children, only offset 0 is valid.
if (!startIsData && uint32_t(startIndx) < startNode->GetChildCount()) {
cChild = startNode->GetChildAt(startIndx);
if (!startIsData && uint32_t(startIndx) < aStartContainer->GetChildCount()) {
cChild = aStartContainer->GetChildAt(startIndx);
NS_WARNING_ASSERTION(cChild, "GetChildAt returned null");
}
@ -406,33 +406,33 @@ nsContentIterator::InitInternal(nsINode* startNode, uint32_t startIndx,
// non-container node (e.g. <br>), we don't skip the node in this case in
// order to address bug 1215798.
bool startIsContainer = true;
if (startNode->IsHTMLElement()) {
if (aStartContainer->IsHTMLElement()) {
if (nsIParserService* ps = nsContentUtils::GetParserService()) {
nsIAtom* name = startNode->NodeInfo()->NameAtom();
nsIAtom* name = aStartContainer->NodeInfo()->NameAtom();
ps->IsContainer(ps->HTMLAtomTagToId(name), startIsContainer);
}
}
if (!startIsData && (startIsContainer || startIndx)) {
mFirst = GetNextSibling(startNode);
mFirst = GetNextSibling(aStartContainer);
NS_WARNING_ASSERTION(mFirst, "GetNextSibling returned null");
// Does mFirst node really intersect the range? The range could be
// 'degenerate', i.e., not collapsed but still contain no content.
if (mFirst &&
NS_WARN_IF(!NodeIsInTraversalRange(mFirst, mPre, startNode,
NS_WARN_IF(!NodeIsInTraversalRange(mFirst, mPre, aStartContainer,
startIndx, endNode, endIndx))) {
mFirst = nullptr;
}
} else {
mFirst = startNode->AsContent();
mFirst = aStartContainer->AsContent();
}
} else {
// post-order
if (NS_WARN_IF(!startNode->IsContent())) {
if (NS_WARN_IF(!aStartContainer->IsContent())) {
// What else can we do?
mFirst = nullptr;
} else {
mFirst = startNode->AsContent();
mFirst = aStartContainer->AsContent();
}
}
} else {
@ -447,7 +447,7 @@ nsContentIterator::InitInternal(nsINode* startNode, uint32_t startIndx,
// 'degenerate', i.e., not collapsed but still contain no content.
if (mFirst &&
!NodeIsInTraversalRange(mFirst, mPre, startNode, startIndx,
!NodeIsInTraversalRange(mFirst, mPre, aStartContainer, startIndx,
endNode, endIndx)) {
mFirst = nullptr;
}
@ -499,7 +499,7 @@ nsContentIterator::InitInternal(nsINode* startNode, uint32_t startIndx,
NS_WARNING_ASSERTION(mLast, "GetPrevSibling returned null");
if (!NodeIsInTraversalRange(mLast, mPre,
startNode, startIndx,
aStartContainer, startIndx,
endNode, endIndx)) {
mLast = nullptr;
}
@ -523,7 +523,7 @@ nsContentIterator::InitInternal(nsINode* startNode, uint32_t startIndx,
NS_WARNING_ASSERTION(mLast, "GetDeepLastChild returned null");
if (NS_WARN_IF(!NodeIsInTraversalRange(mLast, mPre,
startNode, startIndx,
aStartContainer, startIndx,
endNode, endIndx))) {
mLast = nullptr;
}