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 562688 part 14. Eliminate all remaining eELEMENT consumers. r=jst

Browse Source
This commit is contained in:
Boris Zbarsky 2010-04-30 09:12:06 -04:00
parent 3f7bc45256
commit 0ff844ef61
10 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accessible/src/base/nsAccessible.cpp
View File

@ -405,7 +405,7 @@ nsAccessible::GetKeyboardShortcut(nsAString& aAccessKey)
return NS_ERROR_FAILURE;
PRUint32 key = nsCoreUtils::GetAccessKeyFor(content);
if (!key && content->IsNodeOfType(nsIContent::eELEMENT)) {
if (!key && content->IsElement()) {
// Copy access key from label node unless it is labeled
// via an ancestor <label>, in which case that would be redundant
nsCOMPtr<nsIContent> labelContent(nsCoreUtils::GetLabelContent(content));
@ -741,7 +741,7 @@ nsAccessible::GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState)
if (isDisabled) {
*aState |= nsIAccessibleStates::STATE_UNAVAILABLE;
}
else if (content->IsNodeOfType(nsINode::eELEMENT)) {
else if (content->IsElement()) {
nsIFrame *frame = GetFrame();
if (frame && frame->IsFocusable()) {
*aState |= nsIAccessibleStates::STATE_FOCUSABLE;

4
accessible/src/base/nsCoreUtils.cpp
View File

@ -242,7 +242,7 @@ nsCoreUtils::GetDOMElementFor(nsIDOMNode *aNode)
nsCOMPtr<nsINode> node(do_QueryInterface(aNode));
nsIDOMElement *element = nsnull;
if (node->IsNodeOfType(nsINode::eELEMENT))
if (node->IsElement())
CallQueryInterface(node, &element);
else if (node->IsNodeOfType(nsINode::eTEXT)) {
@ -276,7 +276,7 @@ nsCoreUtils::GetDOMNodeFromDOMPoint(nsIDOMNode *aNode, PRUint32 aOffset)
nsIDOMNode *resultNode = nsnull;
nsCOMPtr<nsIContent> content(do_QueryInterface(aNode));
if (content && content->IsNodeOfType(nsINode::eELEMENT)) {
if (content && content->IsElement()) {
PRUint32 childCount = content->GetChildCount();
NS_ASSERTION(aOffset >= 0 && aOffset <= childCount,

4
accessible/src/html/nsHTMLTableAccessible.cpp
View File

@ -407,7 +407,7 @@ nsHTMLTableHeaderCellAccessible::GetRoleInternal(PRUint32 *aRole)
for (PRInt32 idx = indexInParent - 1; idx >= 0; idx--) {
nsIContent* sibling = parent->GetChildAt(idx);
if (sibling && sibling->IsNodeOfType(nsINode::eELEMENT)) {
if (sibling && sibling->IsElement()) {
if (nsCoreUtils::IsHTMLTableHeader(sibling))
*aRole = nsIAccessibleRole::ROLE_COLUMNHEADER;
else
@ -420,7 +420,7 @@ nsHTMLTableHeaderCellAccessible::GetRoleInternal(PRUint32 *aRole)
PRInt32 childCount = parent->GetChildCount();
for (PRInt32 idx = indexInParent + 1; idx < childCount; idx++) {
nsIContent* sibling = parent->GetChildAt(idx);
if (sibling && sibling->IsNodeOfType(nsINode::eELEMENT)) {
if (sibling && sibling->IsElement()) {
if (nsCoreUtils::IsHTMLTableHeader(sibling))
*aRole = nsIAccessibleRole::ROLE_COLUMNHEADER;
else

2
accessible/src/html/nsHyperTextAccessible.cpp
View File

@ -1133,7 +1133,7 @@ nsHyperTextAccessible::GetTextAttributes(PRBool aIncludeDefAttrs,
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIContent> content(do_QueryInterface(node));
if (content && content->IsNodeOfType(nsINode::eELEMENT))
if (content && content->IsElement())
node = do_QueryInterface(content->GetChildAt(nodeOffset));
if (!node)

2
accessible/src/msaa/nsAccessibleWrap.cpp
View File

@ -501,7 +501,7 @@ __try {
if (!content)
return E_FAIL;
if (content->IsNodeOfType(nsINode::eELEMENT)) {
if (content->IsElement()) {
nsAutoString roleString;
if (msaaRole != ROLE_SYSTEM_CLIENT &&
!content->GetAttr(kNameSpaceID_None, nsAccessibilityAtoms::role, roleString)) {

2
editor/libeditor/base/nsEditor.cpp
View File

@ -3606,7 +3606,7 @@ nsEditor::IsEditable(nsIDOMNode *aNode)
if (!resultFrame) // if it has no frame, it is not editable
return PR_FALSE;
NS_ASSERTION(content->IsNodeOfType(nsINode::eTEXT) ||
content->IsNodeOfType(nsINode::eELEMENT),
content->IsElement(),
"frame for non element-or-text?");
if (!content->IsNodeOfType(nsINode::eTEXT))
return PR_TRUE; // not a text node; has a frame

2
editor/libeditor/html/nsHTMLEditorStyle.cpp
View File

@ -1143,7 +1143,7 @@ nsHTMLEditor::GetInlinePropertyBase(nsIAtom *aProperty,
skipNode = PR_TRUE;
}
}
else if (content->IsNodeOfType(nsINode::eELEMENT))
else if (content->IsElement())
{ // handle non-text leaf nodes here
skipNode = PR_TRUE;
}

2
parser/html/nsHtml5TreeOpExecutor.h
View File

@ -267,7 +267,7 @@ class nsHtml5TreeOpExecutor : public nsContentSink,
break;
}
}
if (aChild->IsNodeOfType(nsINode::eELEMENT)) {
if (aChild->IsElement()) {
mElementsSeenInThisAppendBatch.AppendElement(aChild);
}
mElementsSeenInThisAppendBatch.AppendElement(aParent);

4
parser/html/nsHtml5TreeOperation.cpp
View File

@ -286,7 +286,7 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
nsIContent* table = *(mThree.node);
nsIContent* foster = table->GetParent();
if (foster && foster->IsNodeOfType(nsINode::eELEMENT)) {
if (foster && foster->IsElement()) {
aBuilder->FlushPendingAppendNotifications();
nsHtml5OtherDocUpdate update(foster->GetOwnerDoc(),
@ -477,7 +477,7 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
nsIContent* foster = table->GetParent();
if (foster && foster->IsNodeOfType(nsINode::eELEMENT)) {
if (foster && foster->IsElement()) {
aBuilder->FlushPendingAppendNotifications();
nsHtml5OtherDocUpdate update(foster->GetOwnerDoc(),

2
toolkit/components/typeaheadfind/src/nsTypeAheadFind.cpp
View File

@ -797,7 +797,7 @@ nsTypeAheadFind::RangeStartsInsideLink(nsIDOMRange *aRange,
}
origContent = startContent;
if (startContent->IsNodeOfType(nsINode::eELEMENT)) {
if (startContent->IsElement()) {
nsIContent *childContent = startContent->GetChildAt(startOffset);
if (childContent) {
startContent = childContent;