diff --git a/mozilla/accessible/src/base/nsAccessibilityService.cpp b/mozilla/accessible/src/base/nsAccessibilityService.cpp
index 58a15c2e783..4a2ad339971 100644
--- a/mozilla/accessible/src/base/nsAccessibilityService.cpp
+++ b/mozilla/accessible/src/base/nsAccessibilityService.cpp
@@ -1819,7 +1819,7 @@ NS_IMETHODIMP nsAccessibilityService::GetAccessible(nsIDOMNode *aNode,
#ifdef DEBUG_aleventhal_
// Frame hint debugging
++frameHintFailed;
- if (content->IsContentOfType(nsIContent::eTEXT)) {
+ if (content->IsNodeOfType(nsINode::eTEXT)) {
++frameHintFailedForText;
}
frameHintNonexistant += !*aFrameHint;
@@ -1868,7 +1868,7 @@ NS_IMETHODIMP nsAccessibilityService::GetAccessible(nsIDOMNode *aNode,
/**
* Attempt to create an accessible based on what we know
*/
- if (content->IsContentOfType(nsIContent::eTEXT)) {
+ if (content->IsNodeOfType(nsINode::eTEXT)) {
// --- Create HTML for visible text frames ---
if (frame->IsEmpty()) {
*aIsHidden = PR_TRUE;
@@ -1876,7 +1876,7 @@ NS_IMETHODIMP nsAccessibilityService::GetAccessible(nsIDOMNode *aNode,
}
frame->GetAccessible(getter_AddRefs(newAcc));
}
- else if (!content->IsContentOfType(nsIContent::eHTML)) {
+ else if (!content->IsNodeOfType(nsINode::eHTML)) {
// --- Try creating accessible non-HTML (XUL, etc.) ---
// XUL elements may implement nsIAccessibleProvider via XBL
// This allows them to say what kind of accessible to create
diff --git a/mozilla/accessible/src/base/nsAccessible.cpp b/mozilla/accessible/src/base/nsAccessible.cpp
index 830d14623cf..3820cbee890 100644
--- a/mozilla/accessible/src/base/nsAccessible.cpp
+++ b/mozilla/accessible/src/base/nsAccessible.cpp
@@ -191,11 +191,11 @@ NS_IMETHODIMP nsAccessible::GetName(nsAString& aName)
PRBool canAggregateName = mRoleMapEntry &&
mRoleMapEntry->nameRule == eNameOkFromChildren;
- if (content->IsContentOfType(nsIContent::eHTML)) {
+ if (content->IsNodeOfType(nsINode::eHTML)) {
return GetHTMLName(aName, canAggregateName);
}
- if (content->IsContentOfType(nsIContent::eXUL)) {
+ if (content->IsNodeOfType(nsINode::eXUL)) {
return GetXULName(aName, canAggregateName);
}
@@ -213,14 +213,14 @@ NS_IMETHODIMP nsAccessible::GetDescription(nsAString& aDescription)
if (!content) {
return NS_ERROR_FAILURE; // Node shut down
}
- if (!content->IsContentOfType(nsIContent::eTEXT)) {
+ if (!content->IsNodeOfType(nsINode::eTEXT)) {
nsAutoString description;
if (content->HasAttr(kNameSpaceID_XHTML2_Unofficial,
nsAccessibilityAtoms::role)) {
GetTextFromRelationID(nsAccessibilityAtoms::describedby, description);
}
if (description.IsEmpty()) {
- PRBool isXUL = content->IsContentOfType(nsIContent::eXUL);
+ PRBool isXUL = content->IsNodeOfType(nsINode::eXUL);
if (isXUL) {
// Try XUL description text
nsIContent *descriptionContent =
@@ -745,7 +745,7 @@ NS_IMETHODIMP nsAccessible::GetState(PRUint32 *aState)
// if someone sets it on another attribute,
// it seems reasonable to consider it unavailable
PRBool isDisabled;
- if (content->IsContentOfType(nsIContent::eHTML)) {
+ if (content->IsNodeOfType(nsINode::eHTML)) {
// In HTML, just the presence of the disabled attribute means it is disabled,
// therefore disabled="false" indicates disabled!
isDisabled = content->HasAttr(kNameSpaceID_None, nsAccessibilityAtoms::disabled);
@@ -759,7 +759,7 @@ NS_IMETHODIMP nsAccessible::GetState(PRUint32 *aState)
if (isDisabled) {
*aState |= STATE_UNAVAILABLE;
}
- else if (content->IsContentOfType(nsIContent::eELEMENT)) {
+ else if (content->IsNodeOfType(nsINode::eELEMENT)) {
if (!content->HasAttr(kNameSpaceID_XHTML2_Unofficial,
nsAccessibilityAtoms::role)) {
// Default state for element accessible is focusable unless role is manually set
@@ -1209,7 +1209,7 @@ nsresult nsAccessible::AppendNameFromAccessibleFor(nsIContent *aContent,
nsresult nsAccessible::AppendFlatStringFromContentNode(nsIContent *aContent, nsAString *aFlatString)
{
- if (aContent->IsContentOfType(nsIContent::eTEXT)) {
+ if (aContent->IsNodeOfType(nsINode::eTEXT)) {
nsCOMPtr textContent(do_QueryInterface(aContent));
NS_ASSERTION(textContent, "No text content for text content type");
// If it's a text node, append the text
@@ -1249,8 +1249,8 @@ nsresult nsAccessible::AppendFlatStringFromContentNode(nsIContent *aContent, nsA
}
nsAutoString textEquivalent;
- if (!aContent->IsContentOfType(nsIContent::eHTML)) {
- if (aContent->IsContentOfType(nsIContent::eXUL)) {
+ if (!aContent->IsNodeOfType(nsINode::eHTML)) {
+ if (aContent->IsNodeOfType(nsINode::eXUL)) {
nsCOMPtr shell = GetPresShell();
if (!shell) {
return NS_ERROR_FAILURE;
@@ -1347,8 +1347,8 @@ nsresult nsAccessible::AppendFlatStringFromSubtreeRecurse(nsIContent *aContent,
nsIContent *nsAccessible::GetLabelContent(nsIContent *aForNode)
{
- return aForNode->IsContentOfType(nsIContent::eXUL) ? GetXULLabelContent(aForNode) :
- GetHTMLLabelContent(aForNode);
+ return aForNode->IsNodeOfType(nsINode::eXUL) ? GetXULLabelContent(aForNode) :
+ GetHTMLLabelContent(aForNode);
}
nsIContent* nsAccessible::GetXULLabelContent(nsIContent *aForNode, nsIAtom *aLabelType)
@@ -1950,7 +1950,7 @@ NS_IMETHODIMP nsAccessible::GetAccessibleRelated(PRUint32 aRelationType, nsIAcce
case RELATION_LABEL_FOR:
{
if (content->Tag() == nsAccessibilityAtoms::label) {
- nsIAtom *relatedIDAttr = content->IsContentOfType(nsIContent::eHTML) ?
+ nsIAtom *relatedIDAttr = content->IsNodeOfType(nsINode::eHTML) ?
nsAccessibilityAtoms::_for : nsAccessibilityAtoms::control;
content->GetAttr(kNameSpaceID_None, relatedIDAttr, relatedID);
if (relatedID.IsEmpty()) {
@@ -1997,7 +1997,7 @@ NS_IMETHODIMP nsAccessible::GetAccessibleRelated(PRUint32 aRelationType, nsIAcce
nsIContent *description =
GetXULLabelContent(content, nsAccessibilityAtoms::description);
if (!relatedNode && content->Tag() == nsAccessibilityAtoms::description &&
- content->IsContentOfType(nsIContent::eXUL)) {
+ content->IsNodeOfType(nsINode::eXUL)) {
// This affectively adds an optional control attribute to xul:description,
// which only affects accessibility, by allowing the description to be
// tied to a control.
@@ -2008,7 +2008,7 @@ NS_IMETHODIMP nsAccessible::GetAccessibleRelated(PRUint32 aRelationType, nsIAcce
}
case RELATION_DEFAULT_BUTTON:
{
- if (content->IsContentOfType(nsIContent::eHTML)) {
+ if (content->IsNodeOfType(nsINode::eHTML)) {
nsCOMPtr form;
while ((form = do_QueryInterface(content)) == nsnull &&
(content = content->GetParent()) != nsnull) /* nothing */ ;
diff --git a/mozilla/accessible/src/base/nsAccessibleTreeWalker.cpp b/mozilla/accessible/src/base/nsAccessibleTreeWalker.cpp
index bfbc9891146..3f485e9daa0 100755
--- a/mozilla/accessible/src/base/nsAccessibleTreeWalker.cpp
+++ b/mozilla/accessible/src/base/nsAccessibleTreeWalker.cpp
@@ -107,7 +107,7 @@ NS_IMETHODIMP nsAccessibleTreeWalker::GetFullTreeParentNode(nsIDOMNode *aChildNo
void nsAccessibleTreeWalker::GetKids(nsIDOMNode *aParentNode)
{
nsCOMPtr parentContent(do_QueryInterface(aParentNode));
- if (!parentContent || !parentContent->IsContentOfType(nsIContent::eHTML)) {
+ if (!parentContent || !parentContent->IsNodeOfType(nsINode::eHTML)) {
mState.frame = nsnull; // Don't walk frames in non-HTML content, just walk the DOM.
}
@@ -122,7 +122,7 @@ void nsAccessibleTreeWalker::GetKids(nsIDOMNode *aParentNode)
// Walk anonymous content? Not currently used for HTML -- anonymous content there uses frame walking
mState.siblingIndex = 0; // Indicates our index into the sibling list
if (parentContent) {
- if (mBindingManager && !parentContent->IsContentOfType(nsIContent::eHTML)) {
+ if (mBindingManager && !parentContent->IsNodeOfType(nsINode::eHTML)) {
// Walk anonymous content
mBindingManager->GetXBLChildNodesFor(parentContent, getter_AddRefs(mState.siblingList)); // returns null if no anon nodes
}
diff --git a/mozilla/accessible/src/base/nsRootAccessible.cpp b/mozilla/accessible/src/base/nsRootAccessible.cpp
index 5457969ab49..703b526704c 100644
--- a/mozilla/accessible/src/base/nsRootAccessible.cpp
+++ b/mozilla/accessible/src/base/nsRootAccessible.cpp
@@ -870,7 +870,7 @@ void nsRootAccessible::GetTargetNode(nsIDOMEvent *aEvent, nsIDOMNode **aTargetNo
nsevent->GetOriginalTarget(getter_AddRefs(domEventTarget));
nsCOMPtr content(do_QueryInterface(domEventTarget));
nsIContent *bindingParent;
- if (content && content->IsContentOfType(nsIContent::eHTML) &&
+ if (content && content->IsNodeOfType(nsINode::eHTML) &&
(bindingParent = content->GetBindingParent()) != nsnull) {
// Use binding parent when the event occurs in
// anonymous HTML content.
diff --git a/mozilla/accessible/src/html/nsHTMLSelectAccessible.cpp b/mozilla/accessible/src/html/nsHTMLSelectAccessible.cpp
index e41a4454425..b33914b62c3 100644
--- a/mozilla/accessible/src/html/nsHTMLSelectAccessible.cpp
+++ b/mozilla/accessible/src/html/nsHTMLSelectAccessible.cpp
@@ -382,7 +382,7 @@ nsHTMLSelectListAccessible::CacheOptSiblings(nsIAccessibilityService *aAccServic
for (PRUint32 count = 0; count < numChildren; count ++) {
nsIContent *childContent = aParentContent->GetChildAt(count);
- if (!childContent->IsContentOfType(nsIContent::eHTML)) {
+ if (!childContent->IsNodeOfType(nsINode::eHTML)) {
continue;
}
nsCOMPtr tag = childContent->Tag();
@@ -712,7 +712,7 @@ nsresult nsHTMLSelectOptionAccessible::GetFocusedOptionNode(nsIDOMNode *aListNod
void nsHTMLSelectOptionAccessible::SelectionChangedIfOption(nsIContent *aPossibleOption)
{
if (!aPossibleOption || aPossibleOption->Tag() != nsAccessibilityAtoms::option ||
- !aPossibleOption->IsContentOfType(nsIContent::eHTML)) {
+ !aPossibleOption->IsNodeOfType(nsINode::eHTML)) {
return;
}
diff --git a/mozilla/accessible/src/msaa/nsAccessNodeWrap.cpp b/mozilla/accessible/src/msaa/nsAccessNodeWrap.cpp
index 388774c2bce..0ffcde4cdfb 100644
--- a/mozilla/accessible/src/msaa/nsAccessNodeWrap.cpp
+++ b/mozilla/accessible/src/msaa/nsAccessNodeWrap.cpp
@@ -257,7 +257,7 @@ NS_IMETHODIMP nsAccessNodeWrap::GetComputedStyleDeclaration(nsIDOMCSSStyleDeclar
if (!content)
return NS_ERROR_FAILURE;
- if (content->IsContentOfType(nsIContent::eTEXT)) {
+ if (content->IsNodeOfType(nsINode::eTEXT)) {
content = content->GetParent();
NS_ASSERTION(content, "No parent for text node");
}
diff --git a/mozilla/accessible/src/msaa/nsAccessibleWrap.cpp b/mozilla/accessible/src/msaa/nsAccessibleWrap.cpp
index 0702f3cae03..5709f2ff625 100644
--- a/mozilla/accessible/src/msaa/nsAccessibleWrap.cpp
+++ b/mozilla/accessible/src/msaa/nsAccessibleWrap.cpp
@@ -446,7 +446,7 @@ STDMETHODIMP nsAccessibleWrap::get_accRole(
accessNode->GetDOMNode(getter_AddRefs(domNode));
nsIContent *content = GetRoleContent(domNode);
NS_ASSERTION(content, "No content for accessible");
- if (content && content->IsContentOfType(nsIContent::eELEMENT)) {
+ if (content && content->IsNodeOfType(nsINode::eELEMENT)) {
nsAutoString roleString;
if (role != ROLE_CLIENT) {
content->GetAttr(kNameSpaceID_XHTML2_Unofficial, nsAccessibilityAtoms::role, roleString);
diff --git a/mozilla/content/base/public/nsIContent.h b/mozilla/content/base/public/nsIContent.h
index e4c8f3cb0e9..f70f646ee1d 100644
--- a/mozilla/content/base/public/nsIContent.h
+++ b/mozilla/content/base/public/nsIContent.h
@@ -61,8 +61,8 @@ class nsAttrName;
// IID for the nsIContent interface
#define NS_ICONTENT_IID \
-{ 0xf967b2d6, 0xa81c, 0x492c, \
- { 0x91, 0x4b, 0x53, 0x8c, 0x0c, 0x19, 0x37, 0x8c } }
+{ 0x26e42639, 0x013b, 0x442a, \
+ { 0xbe, 0xa0, 0x31, 0xad, 0x43, 0x33, 0x6f, 0x79 } }
/**
* A node of content in a document's content model. This interface
@@ -506,39 +506,6 @@ public:
*/
virtual nsIContent *GetBindingParent() const = 0;
- /**
- * Bit-flags to pass (or'ed together) to IsContentOfType()
- */
- enum {
- /** text elements */
- eTEXT = 0x00000001,
- /** dom elements */
- eELEMENT = 0x00000002,
- /** html elements */
- eHTML = 0x00000004,
- /** form controls */
- eHTML_FORM_CONTROL = 0x00000008,
- /** XUL elements */
- eXUL = 0x00000010,
- /** xml processing instructions */
- ePROCESSING_INSTRUCTION = 0x00000020,
- /** svg elements */
- eSVG = 0x00000040,
- /** comment nodes */
- eCOMMENT = 0x00000080
- };
-
- /**
- * API for doing a quick check if a content object is of a given
- * type, such as HTML, XUL, Text, ... Use this when you can instead of
- * checking the tag.
- *
- * @param aFlags what types you want to test for (see above, eTEXT, eELEMENT,
- * eHTML, eHTML_FORM_CONTROL, eXUL)
- * @return whether the content matches ALL flags passed in
- */
- virtual PRBool IsContentOfType(PRUint32 aFlags) const = 0;
-
/**
* Get the event listener manager, the guy you talk to to register for events
* on this element.
diff --git a/mozilla/content/base/public/nsIDocument.h b/mozilla/content/base/public/nsIDocument.h
index af2cc7b1b3b..ae9bd5fecbc 100644
--- a/mozilla/content/base/public/nsIDocument.h
+++ b/mozilla/content/base/public/nsIDocument.h
@@ -91,8 +91,8 @@ class nsIDocumentObserver;
// IID for the nsIDocument interface
#define NS_IDOCUMENT_IID \
-{ 0x726ce58e, 0x13ab, 0x4c91, \
- { 0x80, 0x45, 0xa8, 0x7b, 0xfe, 0xd5, 0xfe, 0xcd } }
+{ 0x982d6716, 0xdb0b, 0x4bbf, \
+ { 0xb7, 0x23, 0x81, 0x24, 0x6c, 0x10, 0xdb, 0xbd } }
// Flag for AddStyleSheet().
diff --git a/mozilla/content/base/public/nsINode.h b/mozilla/content/base/public/nsINode.h
index 049e3aa277c..748fdfded41 100644
--- a/mozilla/content/base/public/nsINode.h
+++ b/mozilla/content/base/public/nsINode.h
@@ -59,8 +59,8 @@ class nsIPrincipal;
// IID for the nsINode interface
// f96eef82-43fc-4eee-9784-4259415e98a9
#define NS_INODE_IID \
-{ 0xf96eef82, 0x43fc, 0x4eee, \
- { 0x97, 0x84, 0x42, 0x59, 0x41, 0x5e, 0x98, 0xa9 } }
+{ 0x1418310f, 0x2151, 0x47b7, \
+ { 0x9f, 0x4f, 0x4a, 0xc4, 0x95, 0x82, 0xfa, 0xc8 } }
// hack to make egcs / gcc 2.95.2 happy
class nsINode_base : public nsIDOMGCParticipant {
@@ -85,6 +85,44 @@ public:
{
}
+ /**
+ * Bit-flags to pass (or'ed together) to IsNodeOfType()
+ */
+ enum {
+ /** nsIContent nodes */
+ eCONTENT = 1 << 0,
+ /** nsIDocument nodes */
+ eDOCUMENT = 1 << 1,
+ /** nsIAttribute nodes */
+ eATTRIBUTE = 1 << 2,
+ /** elements */
+ eELEMENT = 1 << 3,
+ /** text nodes */
+ eTEXT = 1 << 4,
+ /** xml processing instructions */
+ ePROCESSING_INSTRUCTION = 1 << 5,
+ /** comment nodes */
+ eCOMMENT = 1 << 6,
+ /** html elements */
+ eHTML = 1 << 7,
+ /** form control elements */
+ eHTML_FORM_CONTROL = 1 << 8,
+ /** XUL elements */
+ eXUL = 1 << 9,
+ /** svg elements */
+ eSVG = 1 << 10
+ };
+
+ /**
+ * API for doing a quick check if a content object is of a given
+ * type, such as HTML, XUL, Text, ... Use this when you can instead of
+ * checking the tag.
+ *
+ * @param aFlags what types you want to test for (see above)
+ * @return whether the content matches ALL flags passed in
+ */
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const = 0;
+
/**
* Get the number of children
* @return the number of children
diff --git a/mozilla/content/base/src/mozSanitizingSerializer.cpp b/mozilla/content/base/src/mozSanitizingSerializer.cpp
index 16d99a1a3c3..6b8bd3fe8cf 100644
--- a/mozilla/content/base/src/mozSanitizingSerializer.cpp
+++ b/mozilla/content/base/src/mozSanitizingSerializer.cpp
@@ -215,7 +215,7 @@ mozSanitizingHTMLSerializer::IsContainer(PRInt32 aId)
PRInt32
mozSanitizingHTMLSerializer::GetIdForContent(nsIContent* aContent)
{
- if (!aContent->IsContentOfType(nsIContent::eHTML)) {
+ if (!aContent->IsNodeOfType(nsINode::eHTML)) {
return eHTMLTag_unknown;
}
diff --git a/mozilla/content/base/src/nsCommentNode.cpp b/mozilla/content/base/src/nsCommentNode.cpp
index aab49100c1e..661b90946cb 100644
--- a/mozilla/content/base/src/nsCommentNode.cpp
+++ b/mozilla/content/base/src/nsCommentNode.cpp
@@ -68,7 +68,7 @@ public:
// nsIContent
virtual PRBool MayHaveFrame() const;
- virtual PRBool IsContentOfType(PRUint32 aFlags) const;
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
#ifdef DEBUG
virtual void List(FILE* out, PRInt32 aIndent) const;
@@ -133,9 +133,9 @@ nsCommentNode::MayHaveFrame() const
}
PRBool
-nsCommentNode::IsContentOfType(PRUint32 aFlags) const
+nsCommentNode::IsNodeOfType(PRUint32 aFlags) const
{
- return !(aFlags & ~eCOMMENT);
+ return !(aFlags & ~(eCONTENT | eCOMMENT));
}
NS_IMETHODIMP
diff --git a/mozilla/content/base/src/nsContentList.cpp b/mozilla/content/base/src/nsContentList.cpp
index e0ade4112f8..155356b0d2c 100644
--- a/mozilla/content/base/src/nsContentList.cpp
+++ b/mozilla/content/base/src/nsContentList.cpp
@@ -710,7 +710,7 @@ nsContentList::Match(nsIContent *aContent)
}
if (mMatchAtom) {
- if (!aContent->IsContentOfType(nsIContent::eELEMENT)) {
+ if (!aContent->IsNodeOfType(nsINode::eELEMENT)) {
return PR_FALSE;
}
diff --git a/mozilla/content/base/src/nsContentUtils.cpp b/mozilla/content/base/src/nsContentUtils.cpp
index 36fc62f1d31..2f3c5812cd8 100644
--- a/mozilla/content/base/src/nsContentUtils.cpp
+++ b/mozilla/content/base/src/nsContentUtils.cpp
@@ -791,7 +791,7 @@ nsContentUtils::InProlog(nsIDOMNode *aNode)
while (pos > 0) {
--pos;
nsIContent *sibl = doc->GetChildAt(pos);
- if (sibl->IsContentOfType(nsIContent::eELEMENT)) {
+ if (sibl->IsNodeOfType(nsINode::eELEMENT)) {
return PR_FALSE;
}
}
@@ -1738,7 +1738,7 @@ nsContentUtils::BelongsInForm(nsIDOMHTMLFormElement *aForm,
}
if (content->Tag() == nsHTMLAtoms::form &&
- content->IsContentOfType(nsIContent::eHTML)) {
+ content->IsNodeOfType(nsINode::eHTML)) {
// The child is contained within a form, but not the right form
// so we ignore it.
@@ -2507,7 +2507,7 @@ nsContentUtils::ReportToConsole(PropertiesFile aFile,
static PRBool MatchFormControls(nsIContent* aContent, PRInt32 aNamespaceID,
nsIAtom* aAtom, const nsAString& aData)
{
- return aContent->IsContentOfType(nsIContent::eHTML_FORM_CONTROL);
+ return aContent->IsNodeOfType(nsINode::eHTML_FORM_CONTROL);
}
/* static */ already_AddRefed
diff --git a/mozilla/content/base/src/nsCopySupport.cpp b/mozilla/content/base/src/nsCopySupport.cpp
index 0c0e9f92bfe..453fadd2081 100644
--- a/mozilla/content/base/src/nsCopySupport.cpp
+++ b/mozilla/content/base/src/nsCopySupport.cpp
@@ -320,7 +320,7 @@ nsresult nsCopySupport::IsPlainTextContext(nsISelection *aSel, nsIDocument *aDoc
{
// checking for selection inside a plaintext form widget
- if (!selContent->IsContentOfType(nsIContent::eHTML)) {
+ if (!selContent->IsNodeOfType(nsINode::eHTML)) {
continue;
}
diff --git a/mozilla/content/base/src/nsDOMAttribute.cpp b/mozilla/content/base/src/nsDOMAttribute.cpp
index 4836cdbb5ff..0cf293fdc5a 100644
--- a/mozilla/content/base/src/nsDOMAttribute.cpp
+++ b/mozilla/content/base/src/nsDOMAttribute.cpp
@@ -770,6 +770,12 @@ nsDOMAttribute::LookupNamespaceURI(const nsAString& aNamespacePrefix,
return NS_OK;
}
+PRBool
+nsDOMAttribute::IsNodeOfType(PRUint32 aFlags) const
+{
+ return !(aFlags & ~eATTRIBUTE);
+}
+
PRUint32
nsDOMAttribute::GetChildCount() const
{
diff --git a/mozilla/content/base/src/nsDOMAttribute.h b/mozilla/content/base/src/nsDOMAttribute.h
index 794734333be..13b7411785f 100644
--- a/mozilla/content/base/src/nsDOMAttribute.h
+++ b/mozilla/content/base/src/nsDOMAttribute.h
@@ -109,6 +109,7 @@ public:
nsresult SetOwnerDocument(nsIDocument* aDocument);
// nsINode interface
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
virtual PRUint32 GetChildCount() const;
virtual nsIContent *GetChildAt(PRUint32 aIndex) const;
virtual PRInt32 IndexOf(nsIContent* aPossibleChild) const;
diff --git a/mozilla/content/base/src/nsDOMAttributeMap.cpp b/mozilla/content/base/src/nsDOMAttributeMap.cpp
index f806802dc73..1cad77b5f5b 100644
--- a/mozilla/content/base/src/nsDOMAttributeMap.cpp
+++ b/mozilla/content/base/src/nsDOMAttributeMap.cpp
@@ -290,7 +290,7 @@ nsDOMAttributeMap::SetNamedItemInternal(nsIDOMNode *aNode,
nsAutoString value;
attribute->GetValue(value);
if (!aWithNS && ni->NamespaceID() == kNameSpaceID_None &&
- mContent->IsContentOfType(nsIContent::eHTML)) {
+ mContent->IsNodeOfType(nsINode::eHTML)) {
// Set via setAttribute(), which may do normalization on the
// attribute name for HTML
nsCOMPtr ourElement(do_QueryInterface(mContent));
diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index 82a0e4d4f9c..4e8d05e69bb 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -1691,6 +1691,12 @@ nsDocument::FindContentForSubDocument(nsIDocument *aDocument) const
return data.mResult;
}
+PRBool
+nsDocument::IsNodeOfType(PRUint32 aFlags) const
+{
+ return !(aFlags & ~eDOCUMENT);
+}
+
nsIContent *
nsDocument::GetChildAt(PRUint32 aIndex) const
{
@@ -1713,7 +1719,7 @@ nsresult
nsDocument::InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
PRBool aNotify)
{
- if (aKid->IsContentOfType(nsIContent::eELEMENT)) {
+ if (aKid->IsNodeOfType(nsINode::eELEMENT)) {
if (mRootContent) {
NS_ERROR("Inserting element child when we already have one");
return NS_ERROR_DOM_HIERARCHY_REQUEST_ERR;
@@ -1764,7 +1770,7 @@ nsDocument::RemoveChildAt(PRUint32 aIndex, PRBool aNotify)
nsresult rv = NS_OK;
if (oldKid) {
if (oldKid == mRootContent) {
- NS_ASSERTION(oldKid->IsContentOfType(nsIContent::eELEMENT),
+ NS_ASSERTION(oldKid->IsNodeOfType(nsINode::eELEMENT),
"Non-element root content?");
// Destroy the link map up front and null out mRootContent before we mess
// with the child list. Hopefully no one in doRemoveChildAt will compare
@@ -1803,7 +1809,7 @@ nsDocument::VerifyRootContentState()
nsIContent* kid = GetChildAt(i);
NS_ASSERTION(kid, "Must have kid here");
- if (kid->IsContentOfType(nsIContent::eELEMENT)) {
+ if (kid->IsNodeOfType(nsINode::eELEMENT)) {
NS_ASSERTION(!elementChild, "Multiple element kids?");
elementChild = kid;
}
diff --git a/mozilla/content/base/src/nsDocument.h b/mozilla/content/base/src/nsDocument.h
index 82d894dffb0..6eb20280817 100644
--- a/mozilla/content/base/src/nsDocument.h
+++ b/mozilla/content/base/src/nsDocument.h
@@ -528,6 +528,7 @@ public:
virtual void OnPageHide(PRBool aPersisted);
// nsINode
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
virtual nsIContent *GetChildAt(PRUint32 aIndex) const;
virtual PRInt32 IndexOf(nsIContent* aPossibleChild) const;
virtual PRUint32 GetChildCount() const;
diff --git a/mozilla/content/base/src/nsFrameLoader.cpp b/mozilla/content/base/src/nsFrameLoader.cpp
index 6bab16b9777..f3e81b06639 100644
--- a/mozilla/content/base/src/nsFrameLoader.cpp
+++ b/mozilla/content/base/src/nsFrameLoader.cpp
@@ -348,7 +348,7 @@ nsFrameLoader::EnsureDocShell()
nsAutoString value;
PRBool isContent = PR_FALSE;
- if (mOwnerContent->IsContentOfType(nsIContent::eXUL)) {
+ if (mOwnerContent->IsNodeOfType(nsINode::eXUL)) {
mOwnerContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::type, value);
}
diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.cpp b/mozilla/content/base/src/nsGenericDOMDataNode.cpp
index 6dec473c941..ee3a13ebbac 100644
--- a/mozilla/content/base/src/nsGenericDOMDataNode.cpp
+++ b/mozilla/content/base/src/nsGenericDOMDataNode.cpp
@@ -675,7 +675,7 @@ nsGenericDOMDataNode::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
// NS_PRECONDITION(!aParent || aDocument == aParent->GetCurrentDoc(),
// "aDocument must be current doc of aParent");
NS_PRECONDITION(!aParent ||
- (aParent->IsContentOfType(eXUL) && aDocument == nsnull) ||
+ (aParent->IsNodeOfType(eXUL) && aDocument == nsnull) ||
aDocument == aParent->GetCurrentDoc(),
"aDocument must be current doc of aParent");
NS_PRECONDITION(!GetCurrentDoc() && !IsInDoc(),
@@ -959,11 +959,12 @@ nsGenericDOMDataNode::GetBindingParent() const
}
PRBool
-nsGenericDOMDataNode::IsContentOfType(PRUint32 aFlags) const
+nsGenericDOMDataNode::IsNodeOfType(PRUint32 aFlags) const
{
- return PR_FALSE;
+ return !(aFlags & ~eCONTENT);
}
+
#ifdef DEBUG
void
nsGenericDOMDataNode::List(FILE* out, PRInt32 aIndent) const
diff --git a/mozilla/content/base/src/nsGenericDOMDataNode.h b/mozilla/content/base/src/nsGenericDOMDataNode.h
index 811c789d688..17824c6d735 100644
--- a/mozilla/content/base/src/nsGenericDOMDataNode.h
+++ b/mozilla/content/base/src/nsGenericDOMDataNode.h
@@ -241,7 +241,7 @@ public:
virtual const nsVoidArray *GetRangeList() const;
virtual nsIContent *GetBindingParent() const;
- virtual PRBool IsContentOfType(PRUint32 aFlags) const;
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
virtual nsresult GetListenerManager(PRBool aCreateIfNotFound,
nsIEventListenerManager** aResult);
diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp
index c0e4348eb36..c3ec156944d 100644
--- a/mozilla/content/base/src/nsGenericElement.cpp
+++ b/mozilla/content/base/src/nsGenericElement.cpp
@@ -290,7 +290,7 @@ nsNode3Tearoff::GetTextContent(nsIContent *aContent,
aTextContent.Truncate();
while (!iter->IsDone()) {
nsIContent *content = iter->GetCurrentNode();
- if (content->IsContentOfType(nsIContent::eTEXT)) {
+ if (content->IsNodeOfType(nsINode::eTEXT)) {
nsCOMPtr textContent(do_QueryInterface(iter->GetCurrentNode()));
if (textContent)
textContent->AppendTextTo(aTextContent);
@@ -1713,7 +1713,7 @@ nsGenericElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
// NS_PRECONDITION(!aParent || aDocument == aParent->GetCurrentDoc(),
// "aDocument must be current doc of aParent");
NS_PRECONDITION(!aParent ||
- (aParent->IsContentOfType(eXUL) && aDocument == nsnull) ||
+ (aParent->IsNodeOfType(eXUL) && aDocument == nsnull) ||
aDocument == aParent->GetCurrentDoc(),
"aDocument must be current doc of aParent");
NS_PRECONDITION(!GetCurrentDoc(), "Already have a document. Unbind first!");
@@ -2235,9 +2235,9 @@ nsGenericElement::GetBindingParent() const
}
PRBool
-nsGenericElement::IsContentOfType(PRUint32 aFlags) const
+nsGenericElement::IsNodeOfType(PRUint32 aFlags) const
{
- return !(aFlags & ~eELEMENT);
+ return !(aFlags & ~(eCONTENT | eELEMENT));
}
//----------------------------------------------------------------------
@@ -2661,7 +2661,7 @@ PRBool IsAllowedAsChild(nsIContent* aNewChild, PRUint16 aNewNodeType,
for (PRUint32 index = 0; index < count; ++index) {
nsIContent* childContent = aNewChild->GetChildAt(index);
NS_ASSERTION(childContent, "Something went wrong");
- if (childContent->IsContentOfType(nsIContent::eELEMENT)) {
+ if (childContent->IsNodeOfType(nsINode::eELEMENT)) {
if (sawElement) {
// Can't put two elements into a document
return PR_FALSE;
@@ -3014,7 +3014,7 @@ nsGenericElement::doReplaceOrInsertBefore(PRBool aReplace,
}
else {
// Not inserting a fragment but rather a single node.
- PRBool newContentIsXUL = newContent->IsContentOfType(eXUL);
+ PRBool newContentIsXUL = newContent->IsNodeOfType(eXUL);
// Remove the element from the old parent if one exists
nsINode* oldParent = newContent->GetNodeParent();
@@ -3821,7 +3821,7 @@ nsGenericElement::GetContentsAsText(nsAString& aText)
for (i = 0; i < children; ++i) {
nsIContent *child = GetChildAt(i);
- if (child->IsContentOfType(eTEXT)) {
+ if (child->IsNodeOfType(eTEXT)) {
tc = do_QueryInterface(child);
tc->AppendTextTo(aText);
diff --git a/mozilla/content/base/src/nsGenericElement.h b/mozilla/content/base/src/nsGenericElement.h
index cac33c99134..6aa5e1740b7 100644
--- a/mozilla/content/base/src/nsGenericElement.h
+++ b/mozilla/content/base/src/nsGenericElement.h
@@ -445,7 +445,7 @@ public:
virtual const nsVoidArray *GetRangeList() const;
virtual void SetFocus(nsPresContext* aContext);
virtual nsIContent *GetBindingParent() const;
- virtual PRBool IsContentOfType(PRUint32 aFlags) const;
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
virtual nsresult GetListenerManager(PRBool aCreateIfNotFound,
nsIEventListenerManager** aResult);
virtual already_AddRefed GetBaseURI() const;
diff --git a/mozilla/content/base/src/nsObjectLoadingContent.cpp b/mozilla/content/base/src/nsObjectLoadingContent.cpp
index a2b0b718f6d..944bcc48afc 100644
--- a/mozilla/content/base/src/nsObjectLoadingContent.cpp
+++ b/mozilla/content/base/src/nsObjectLoadingContent.cpp
@@ -1410,7 +1410,7 @@ nsObjectLoadingContent::ShouldShowDefaultPlugin(nsIContent* aContent)
/* static */ PRBool
nsObjectLoadingContent::IsUnsupportedPlugin(nsIContent* aContent)
{
- if (!aContent->IsContentOfType(nsIContent::eHTML)) {
+ if (!aContent->IsNodeOfType(nsINode::eHTML)) {
return PR_FALSE;
}
@@ -1425,7 +1425,7 @@ nsObjectLoadingContent::IsUnsupportedPlugin(nsIContent* aContent)
nsIContent* child = aContent->GetChildAt(i);
NS_ASSERTION(child, "GetChildCount lied!");
- if (child->IsContentOfType(nsIContent::eHTML) &&
+ if (child->IsNodeOfType(nsINode::eHTML) &&
child->Tag() == nsHTMLAtoms::param &&
child->AttrValueIs(kNameSpaceID_None, nsHTMLAtoms::name,
NS_LITERAL_STRING("pluginurl"), eIgnoreCase)) {
diff --git a/mozilla/content/base/src/nsPlainTextSerializer.cpp b/mozilla/content/base/src/nsPlainTextSerializer.cpp
index 29a5c5dd049..bef966e98ff 100644
--- a/mozilla/content/base/src/nsPlainTextSerializer.cpp
+++ b/mozilla/content/base/src/nsPlainTextSerializer.cpp
@@ -1809,7 +1809,7 @@ nsPlainTextSerializer::IsCurrentNodeConverted(const nsIParserNode* aNode)
PRInt32
nsPlainTextSerializer::GetIdForContent(nsIContent* aContent)
{
- if (!aContent->IsContentOfType(nsIContent::eHTML)) {
+ if (!aContent->IsNodeOfType(nsINode::eHTML)) {
return eHTMLTag_unknown;
}
diff --git a/mozilla/content/base/src/nsScriptLoader.cpp b/mozilla/content/base/src/nsScriptLoader.cpp
index 4d50da0fdb6..c9fdc7a4499 100644
--- a/mozilla/content/base/src/nsScriptLoader.cpp
+++ b/mozilla/content/base/src/nsScriptLoader.cpp
@@ -274,7 +274,7 @@ nsScriptLoader::InNonScriptingContainer(nsIScriptElement* aScriptElement)
// displayed and processed. This might change if we support either
// prefs or per-document container settings for not allowing
// frames or plugins.
- if (content->IsContentOfType(nsIContent::eHTML) &&
+ if (content->IsNodeOfType(nsINode::eHTML) &&
(localName == nsHTMLAtoms::iframe ||
localName == nsHTMLAtoms::noframes ||
localName == nsHTMLAtoms::noembed)) {
diff --git a/mozilla/content/base/src/nsTextNode.cpp b/mozilla/content/base/src/nsTextNode.cpp
index 63a6086ff84..f45a616762a 100644
--- a/mozilla/content/base/src/nsTextNode.cpp
+++ b/mozilla/content/base/src/nsTextNode.cpp
@@ -72,7 +72,7 @@ public:
NS_FORWARD_NSIDOMTEXT(nsGenericDOMDataNode::)
// nsIContent
- virtual PRBool IsContentOfType(PRUint32 aFlags) const;
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
#ifdef DEBUG
virtual void List(FILE* out, PRInt32 aIndent) const;
virtual void DumpContent(FILE* out, PRInt32 aIndent, PRBool aDumpAll) const;
@@ -213,9 +213,9 @@ nsTextNode::GetNodeType(PRUint16* aNodeType)
}
PRBool
-nsTextNode::IsContentOfType(PRUint32 aFlags) const
+nsTextNode::IsNodeOfType(PRUint32 aFlags) const
{
- return !(aFlags & ~eTEXT);
+ return !(aFlags & ~(eCONTENT | eTEXT));
}
nsGenericDOMDataNode*
diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp
index be6ab27bc1d..97c109d198e 100644
--- a/mozilla/content/events/src/nsEventStateManager.cpp
+++ b/mozilla/content/events/src/nsEventStateManager.cpp
@@ -981,7 +981,7 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext,
nsCOMPtr content = dont_AddRef(NS_STATIC_CAST(nsIContent*, mAccessKeys->Get(&key)));
// if it's a XUL element...
- if (content->IsContentOfType(nsIContent::eXUL)) {
+ if (content->IsNodeOfType(nsINode::eXUL)) {
// find out what type of content node this is
if (content->Tag() == nsXULAtoms::label) {
// If anything fails, this will be null ...
@@ -1272,7 +1272,7 @@ nsEventStateManager::FireContextClick()
nsIAtom *tag = mGestureDownContent->Tag();
PRBool allowedToDispatch = PR_TRUE;
- if (mGestureDownContent->IsContentOfType(nsIContent::eXUL)) {
+ if (mGestureDownContent->IsNodeOfType(nsINode::eXUL)) {
if (tag == nsXULAtoms::scrollbar ||
tag == nsXULAtoms::scrollbarbutton ||
tag == nsXULAtoms::button)
@@ -1293,7 +1293,7 @@ nsEventStateManager::FireContextClick()
}
}
}
- else if (mGestureDownContent->IsContentOfType(nsIContent::eHTML)) {
+ else if (mGestureDownContent->IsNodeOfType(nsINode::eHTML)) {
nsCOMPtr formCtrl(do_QueryInterface(mGestureDownContent));
if (formCtrl) {
@@ -1609,8 +1609,8 @@ nsEventStateManager::DoScrollTextsize(nsIFrame *aTargetFrame,
// Exclude form controls and XUL content.
nsIContent *content = aTargetFrame->GetContent();
if (content &&
- !content->IsContentOfType(nsIContent::eHTML_FORM_CONTROL) &&
- !content->IsContentOfType(nsIContent::eXUL))
+ !content->IsNodeOfType(nsINode::eHTML_FORM_CONTROL) &&
+ !content->IsNodeOfType(nsINode::eXUL))
{
// positive adjustment to increase text size, non-positive to decrease
ChangeTextSize((adjustment > 0) ? 1 : -1);
@@ -3047,7 +3047,7 @@ nsEventStateManager::ChangeFocusWith(nsIContent* aFocusContent,
// Select text fields when focused via keyboard (tab or accesskey)
if (sTextfieldSelectModel == eTextfieldSelect_auto &&
mCurrentFocus &&
- mCurrentFocus->IsContentOfType(nsIContent::eHTML_FORM_CONTROL)) {
+ mCurrentFocus->IsNodeOfType(nsINode::eHTML_FORM_CONTROL)) {
nsCOMPtr formControl(do_QueryInterface(mCurrentFocus));
PRInt32 controlType = formControl->GetType();
if (controlType == NS_FORM_INPUT_TEXT ||
@@ -3478,7 +3478,7 @@ nsEventStateManager::GetNextTabbableContent(nsIContent* aRootContent,
mPresContext, aStartFrame);
NS_ENSURE_SUCCESS(rv, rv);
if (!aStartContent || aStartContent->Tag() != nsHTMLAtoms::area ||
- !aStartContent->IsContentOfType(nsIContent::eHTML)) {
+ !aStartContent->IsNodeOfType(nsINode::eHTML)) {
// Need to do special check in case we're in an imagemap which has multiple
// content per frame, so don't skip over the starting frame.
rv = forward ? frameTraversal->Next() : frameTraversal->Prev();
@@ -4038,7 +4038,7 @@ IsFocusable(nsIPresShell* aPresShell, nsIContent* aContent)
// the content is focusable (not disabled).
// We don't use nsIFrame::IsFocusable() because it defaults
// tabindex to -1 for -moz-user-focus:ignore (bug 305840).
- if (aContent->IsContentOfType(nsIContent::eXUL)) {
+ if (aContent->IsNodeOfType(nsINode::eXUL)) {
// XXX Eventually we should have a better check, but for
// now checking for style visibility and focusability caused
// too many regressions.
@@ -4584,7 +4584,7 @@ nsEventStateManager::GetDocSelectionLocation(nsIContent **aStartContent,
nsIContent *childContent = nsnull;
startContent = do_QueryInterface(startNode);
- if (startContent->IsContentOfType(nsIContent::eELEMENT)) {
+ if (startContent->IsNodeOfType(nsINode::eELEMENT)) {
NS_ASSERTION(*aStartOffset >= 0, "Start offset cannot be negative");
childContent = startContent->GetChildAt(*aStartOffset);
if (childContent) {
@@ -4593,7 +4593,7 @@ nsEventStateManager::GetDocSelectionLocation(nsIContent **aStartContent,
}
endContent = do_QueryInterface(endNode);
- if (endContent->IsContentOfType(nsIContent::eELEMENT)) {
+ if (endContent->IsNodeOfType(nsINode::eELEMENT)) {
PRInt32 endOffset = 0;
domRange->GetEndOffset(&endOffset);
NS_ASSERTION(endOffset >= 0, "End offset cannot be negative");
@@ -4636,7 +4636,7 @@ nsEventStateManager::GetDocSelectionLocation(nsIContent **aStartContent,
domNode->GetNodeValue(nodeValue);
PRBool isFormControl =
- startContent->IsContentOfType(nsIContent::eHTML_FORM_CONTROL);
+ startContent->IsNodeOfType(nsINode::eHTML_FORM_CONTROL);
if (nodeValue.Length() == *aStartOffset && !isFormControl &&
startContent != mDocument->GetRootContent()) {
@@ -4792,7 +4792,7 @@ nsEventStateManager::MoveFocusToCaret(PRBool aCanFocusDoc,
// Add better focusable test here later if necessary ...
if (tag == nsHTMLAtoms::a &&
- testContent->IsContentOfType(nsIContent::eHTML)) {
+ testContent->IsNodeOfType(nsINode::eHTML)) {
*aIsSelectionWithFocus = PR_TRUE;
}
else {
@@ -4835,7 +4835,7 @@ nsEventStateManager::MoveFocusToCaret(PRBool aCanFocusDoc,
// Add better focusable test here later if necessary ...
if (testContent) {
if (testContent->Tag() == nsHTMLAtoms::a &&
- testContent->IsContentOfType(nsIContent::eHTML)) {
+ testContent->IsNodeOfType(nsINode::eHTML)) {
*aIsSelectionWithFocus = PR_TRUE;
FocusElementButNotDocument(testContent);
return NS_OK;
@@ -4931,7 +4931,7 @@ nsEventStateManager::MoveCaretToFocus()
nsCOMPtr firstChild;
currentFocusNode->GetFirstChild(getter_AddRefs(firstChild));
if (!firstChild ||
- mCurrentFocus->IsContentOfType(nsIContent::eHTML_FORM_CONTROL)) {
+ mCurrentFocus->IsNodeOfType(nsINode::eHTML_FORM_CONTROL)) {
// If current focus node is a leaf, set range to before the
// node by using the parent as a container.
// This prevents it from appearing as selected.
@@ -5095,7 +5095,7 @@ nsEventStateManager::IsFrameSetDoc(nsIDocShell* aDocShell)
nsINodeInfo *ni = childContent->NodeInfo();
- if (childContent->IsContentOfType(nsIContent::eHTML) &&
+ if (childContent->IsNodeOfType(nsINode::eHTML) &&
ni->Equals(nsHTMLAtoms::frameset)) {
isFrameSet = PR_TRUE;
break;
diff --git a/mozilla/content/events/src/nsXMLEventsManager.cpp b/mozilla/content/events/src/nsXMLEventsManager.cpp
index 865c277eeb6..8445510d249 100644
--- a/mozilla/content/events/src/nsXMLEventsManager.cpp
+++ b/mozilla/content/events/src/nsXMLEventsManager.cpp
@@ -418,7 +418,7 @@ nsXMLEventsManager::ContentRemoved(nsIDocument* aDocument,
nsIContent* aChild,
PRInt32 aIndexInContainer)
{
- if (!aChild || !aChild->IsContentOfType(nsIContent::eELEMENT))
+ if (!aChild || !aChild->IsNodeOfType(nsINode::eELEMENT))
return;
//Note, we can't use IDs here, the observer may not always have an ID.
//And to remember: the same observer can be referenced by many
diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
index 4efe597518f..90d189b920e 100644
--- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
@@ -572,7 +572,7 @@ static PRBool
IsBody(nsIContent *aContent)
{
return (aContent->NodeInfo()->Equals(nsHTMLAtoms::body) &&
- aContent->IsContentOfType(nsIContent::eHTML));
+ aContent->IsNodeOfType(nsINode::eHTML));
}
static PRBool
@@ -583,7 +583,7 @@ IsOffsetParent(nsIContent *aContent)
return ((ni->Equals(nsHTMLAtoms::td) ||
ni->Equals(nsHTMLAtoms::table) ||
ni->Equals(nsHTMLAtoms::th)) &&
- aContent->IsContentOfType(nsIContent::eHTML));
+ aContent->IsNodeOfType(nsINode::eHTML));
}
void
@@ -1347,7 +1347,7 @@ nsGenericHTMLElement::FindForm(nsIForm* aCurrentForm)
while (content) {
// If the current ancestor is a form, return it as our form
if (content->Tag() == nsHTMLAtoms::form &&
- content->IsContentOfType(nsIContent::eHTML)) {
+ content->IsNodeOfType(nsINode::eHTML)) {
nsIDOMHTMLFormElement* form;
CallQueryInterface(content, &form);
@@ -1400,7 +1400,7 @@ static PRBool
IsArea(nsIContent *aContent)
{
return (aContent->Tag() == nsHTMLAtoms::area &&
- aContent->IsContentOfType(nsIContent::eHTML));
+ aContent->IsNodeOfType(nsINode::eHTML));
}
nsresult
@@ -1922,9 +1922,9 @@ nsGenericHTMLElement::DumpContent(FILE* out, PRInt32 aIndent,
PRBool
-nsGenericHTMLElement::IsContentOfType(PRUint32 aFlags) const
+nsGenericHTMLElement::IsNodeOfType(PRUint32 aFlags) const
{
- return !(aFlags & ~(eELEMENT | eHTML));
+ return !(aFlags & ~(eCONTENT | eELEMENT | eHTML));
}
//----------------------------------------------------------------------
@@ -2956,9 +2956,9 @@ NS_INTERFACE_MAP_END_INHERITING(nsGenericHTMLElement)
PRBool
-nsGenericHTMLFormElement::IsContentOfType(PRUint32 aFlags) const
+nsGenericHTMLFormElement::IsNodeOfType(PRUint32 aFlags) const
{
- return !(aFlags & ~(eELEMENT | eHTML | eHTML_FORM_CONTROL));
+ return !(aFlags & ~(eCONTENT | eELEMENT | eHTML | eHTML_FORM_CONTROL));
}
NS_IMETHODIMP
@@ -3498,7 +3498,7 @@ nsGenericHTMLElement::RemoveFocus(nsPresContext *aPresContext)
if (!aPresContext)
return;
- if (IsContentOfType(eHTML_FORM_CONTROL)) {
+ if (IsNodeOfType(eHTML_FORM_CONTROL)) {
nsIFormControlFrame* formControlFrame = GetFormControlFrame(PR_FALSE);
if (formControlFrame) {
formControlFrame->SetFocus(PR_FALSE, PR_FALSE);
diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.h b/mozilla/content/html/content/src/nsGenericHTMLElement.h
index 2a1a5d2ce36..5a4b4933619 100644
--- a/mozilla/content/html/content/src/nsGenericHTMLElement.h
+++ b/mozilla/content/html/content/src/nsGenericHTMLElement.h
@@ -85,7 +85,7 @@ public:
/** Typesafe, non-refcounting cast from nsIContent. Cheaper than QI. **/
static nsGenericHTMLElement* FromContent(nsIContent *aContent)
{
- if (aContent->IsContentOfType(eHTML))
+ if (aContent->IsNodeOfType(eHTML))
return NS_STATIC_CAST(nsGenericHTMLElement*, aContent);
return nsnull;
}
@@ -191,7 +191,7 @@ public:
virtual void List(FILE* out, PRInt32 aIndent) const;
virtual void DumpContent(FILE* out, PRInt32 aIndent,PRBool aDumpAll) const;
#endif
- virtual PRBool IsContentOfType(PRUint32 aFlags) const;
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
virtual void RemoveFocus(nsPresContext *aPresContext);
virtual PRBool IsFocusable(PRInt32 *aTabIndex = nsnull);
@@ -794,7 +794,7 @@ public:
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);
- virtual PRBool IsContentOfType(PRUint32 aFlags) const;
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
// nsIFormControl
NS_IMETHOD GetForm(nsIDOMHTMLFormElement** aForm);
diff --git a/mozilla/content/html/content/src/nsHTMLLabelElement.cpp b/mozilla/content/html/content/src/nsHTMLLabelElement.cpp
index b991df45a55..701adb805c8 100644
--- a/mozilla/content/html/content/src/nsHTMLLabelElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLLabelElement.cpp
@@ -318,7 +318,7 @@ nsHTMLLabelElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
inline PRBool IsNonLabelFormControl(nsIContent *aContent)
{
- return aContent->IsContentOfType(nsIContent::eHTML_FORM_CONTROL) &&
+ return aContent->IsNodeOfType(nsINode::eHTML_FORM_CONTROL) &&
aContent->Tag() != nsHTMLAtoms::label;
}
diff --git a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
index b1d82ea65e0..172f30e03b3 100644
--- a/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLSelectElement.cpp
@@ -735,7 +735,7 @@ nsHTMLSelectElement::RemoveOptionsFromList(nsIContent* aOptions,
static PRBool IsOptGroup(nsIContent *aContent)
{
return (aContent->NodeInfo()->Equals(nsHTMLAtoms::optgroup) &&
- aContent->IsContentOfType(nsIContent::eHTML));
+ aContent->IsNodeOfType(nsINode::eHTML));
}
// If the document is such that recursing over these options gets us
diff --git a/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp b/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp
index 169ee0a4d15..38d3a95d49f 100644
--- a/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTableCellElement.cpp
@@ -135,7 +135,7 @@ nsHTMLTableCellElement::GetTable()
if (parent) { // GetParent() should be a row
nsIContent* section = parent->GetParent();
if (section) {
- if (section->IsContentOfType(eHTML) &&
+ if (section->IsNodeOfType(eHTML) &&
section->NodeInfo()->Equals(nsHTMLAtoms::table)) {
// XHTML, without a row group
result = section;
diff --git a/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp b/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp
index a93562c2cdc..35346cce778 100644
--- a/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTableRowElement.cpp
@@ -263,7 +263,7 @@ IsCell(nsIContent *aContent, PRInt32 aNamespaceID,
nsIAtom* tag = aContent->Tag();
return ((tag == nsHTMLAtoms::td || tag == nsHTMLAtoms::th) &&
- aContent->IsContentOfType(nsIContent::eHTML));
+ aContent->IsNodeOfType(nsINode::eHTML));
}
NS_IMETHODIMP
diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp
index fe84bf40cf1..0f1a8d7ca62 100644
--- a/mozilla/content/html/document/src/nsHTMLDocument.cpp
+++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp
@@ -3217,7 +3217,7 @@ nsHTMLDocument::RemoveFromIdTable(nsIContent *aContent)
nsresult
nsHTMLDocument::UnregisterNamedItems(nsIContent *aContent)
{
- if (aContent->IsContentOfType(nsIContent::eTEXT)) {
+ if (aContent->IsNodeOfType(nsINode::eTEXT)) {
// Text nodes are not named items nor can they have children.
return NS_OK;
}
@@ -3253,7 +3253,7 @@ nsHTMLDocument::UnregisterNamedItems(nsIContent *aContent)
nsresult
nsHTMLDocument::RegisterNamedItems(nsIContent *aContent)
{
- if (aContent->IsContentOfType(nsIContent::eTEXT)) {
+ if (aContent->IsNodeOfType(nsINode::eTEXT)) {
// Text nodes are not named items nor can they have children.
return NS_OK;
}
@@ -3292,7 +3292,7 @@ FindNamedItems(nsIAtom* aName, nsIContent *aContent,
NS_ASSERTION(aEntry.mNameContentList != NAME_NOT_VALID,
"Entry that should never have a list passed to FindNamedItems()!");
- if (aContent->IsContentOfType(nsIContent::eTEXT)) {
+ if (aContent->IsNodeOfType(nsINode::eTEXT)) {
// Text nodes are not named items nor can they have children.
return;
}
@@ -3462,7 +3462,7 @@ nsHTMLDocument::ResolveName(const nsAString& aName,
nsIContent *e = entry->GetIdContent();
- if (e && e != ID_NOT_IN_DOCUMENT && e->IsContentOfType(nsIContent::eHTML)) {
+ if (e && e != ID_NOT_IN_DOCUMENT && e->IsNodeOfType(nsINode::eHTML)) {
nsIAtom *tag = e->Tag();
if ((tag == nsHTMLAtoms::embed ||
@@ -3493,7 +3493,7 @@ nsHTMLDocument::GetBodyContent()
NS_ENSURE_TRUE(child, NS_ERROR_UNEXPECTED);
if (child->NodeInfo()->Equals(nsHTMLAtoms::body, mDefaultNamespaceID) &&
- child->IsContentOfType(nsIContent::eHTML)) {
+ child->IsNodeOfType(nsINode::eHTML)) {
mBodyContent = do_QueryInterface(child);
return PR_TRUE;
diff --git a/mozilla/content/svg/content/src/nsSVGElement.cpp b/mozilla/content/svg/content/src/nsSVGElement.cpp
index 3ecc4634875..4d2d0b69a6d 100644
--- a/mozilla/content/svg/content/src/nsSVGElement.cpp
+++ b/mozilla/content/svg/content/src/nsSVGElement.cpp
@@ -297,9 +297,9 @@ nsSVGElement::UnsetAttr(PRInt32 aNamespaceID, nsIAtom* aName,
}
PRBool
-nsSVGElement::IsContentOfType(PRUint32 aFlags) const
+nsSVGElement::IsNodeOfType(PRUint32 aFlags) const
{
- return !(aFlags & ~(eELEMENT | eSVG));
+ return !(aFlags & ~(eCONTENT | eELEMENT | eSVG));
}
NS_IMETHODIMP
diff --git a/mozilla/content/svg/content/src/nsSVGElement.h b/mozilla/content/svg/content/src/nsSVGElement.h
index c89f6f5d017..2d9967c012f 100644
--- a/mozilla/content/svg/content/src/nsSVGElement.h
+++ b/mozilla/content/svg/content/src/nsSVGElement.h
@@ -83,7 +83,7 @@ public:
virtual nsresult UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
PRBool aNotify);
- virtual PRBool IsContentOfType(PRUint32 aFlags) const;
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker);
NS_IMETHOD SetInlineStyleRule(nsICSSStyleRule* aStyleRule, PRBool aNotify);
diff --git a/mozilla/content/xbl/src/nsXBLContentSink.cpp b/mozilla/content/xbl/src/nsXBLContentSink.cpp
index 937ab009617..357a80c346a 100644
--- a/mozilla/content/xbl/src/nsXBLContentSink.cpp
+++ b/mozilla/content/xbl/src/nsXBLContentSink.cpp
@@ -888,7 +888,7 @@ nsresult
nsXBLContentSink::AddAttributes(const PRUnichar** aAtts,
nsIContent* aContent)
{
- if (aContent->IsContentOfType(nsIContent::eXUL))
+ if (aContent->IsNodeOfType(nsINode::eXUL))
return NS_OK; // Nothing to do, since the proto already has the attrs.
return nsXMLContentSink::AddAttributes(aAtts, aContent);
diff --git a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
index 49538caf04e..f30a4909f7a 100644
--- a/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
+++ b/mozilla/content/xbl/src/nsXBLPrototypeHandler.cpp
@@ -323,7 +323,7 @@ nsXBLPrototypeHandler::ExecuteHandler(nsIDOMEventReceiver* aReceiver,
if (focusedContent) {
while (content) {
if (content->Tag() == nsHTMLAtoms::a &&
- content->IsContentOfType(nsIContent::eHTML)) {
+ content->IsNodeOfType(nsINode::eHTML)) {
isLink = PR_TRUE;
break;
}
diff --git a/mozilla/content/xbl/src/nsXBLService.cpp b/mozilla/content/xbl/src/nsXBLService.cpp
index a0ed54bbba1..22e51bec007 100644
--- a/mozilla/content/xbl/src/nsXBLService.cpp
+++ b/mozilla/content/xbl/src/nsXBLService.cpp
@@ -1061,7 +1061,7 @@ nsXBLService::LoadBindingDocumentInfo(nsIContent* aBoundElement,
ni->Equals(nsXULAtoms::thumb, kNameSpaceID_XUL) ||
((ni->Equals(nsHTMLAtoms::input) ||
ni->Equals(nsHTMLAtoms::select)) &&
- aBoundElement->IsContentOfType(nsIContent::eHTML)))) &&
+ aBoundElement->IsNodeOfType(nsINode::eHTML)))) &&
!aForceSyncLoad) {
// The third line of defense is to investigate whether or not the
// document is currently being loaded asynchronously. If so, there's no
diff --git a/mozilla/content/xml/content/src/nsXMLCDATASection.cpp b/mozilla/content/xml/content/src/nsXMLCDATASection.cpp
index f64e09e785c..b9fc3e98313 100644
--- a/mozilla/content/xml/content/src/nsXMLCDATASection.cpp
+++ b/mozilla/content/xml/content/src/nsXMLCDATASection.cpp
@@ -65,7 +65,7 @@ public:
// Empty interface
// nsIContent
- virtual PRBool IsContentOfType(PRUint32 aFlags) const;
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
#ifdef DEBUG
virtual void List(FILE* out, PRInt32 aIndent) const;
virtual void DumpContent(FILE* out, PRInt32 aIndent,PRBool aDumpAll) const;
@@ -121,9 +121,9 @@ NS_IMPL_RELEASE_INHERITED(nsXMLCDATASection, nsGenericDOMDataNode)
PRBool
-nsXMLCDATASection::IsContentOfType(PRUint32 aFlags) const
+nsXMLCDATASection::IsNodeOfType(PRUint32 aFlags) const
{
- return !(aFlags & ~eTEXT);
+ return !(aFlags & ~(eCONTENT | eTEXT));
}
NS_IMETHODIMP
diff --git a/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp b/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp
index 454847cb4cc..d38a7de8bab 100644
--- a/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp
+++ b/mozilla/content/xml/content/src/nsXMLProcessingInstruction.cpp
@@ -131,9 +131,9 @@ nsXMLProcessingInstruction::GetAttrValue(nsIAtom *aName, nsAString& aValue)
}
PRBool
-nsXMLProcessingInstruction::IsContentOfType(PRUint32 aFlags) const
+nsXMLProcessingInstruction::IsNodeOfType(PRUint32 aFlags) const
{
- return !(aFlags & ~ePROCESSING_INSTRUCTION);
+ return !(aFlags & ~(eCONTENT | ePROCESSING_INSTRUCTION));
}
// virtual
diff --git a/mozilla/content/xml/content/src/nsXMLProcessingInstruction.h b/mozilla/content/xml/content/src/nsXMLProcessingInstruction.h
index 61e64b907ac..5a4beebd66b 100644
--- a/mozilla/content/xml/content/src/nsXMLProcessingInstruction.h
+++ b/mozilla/content/xml/content/src/nsXMLProcessingInstruction.h
@@ -64,7 +64,7 @@ public:
NS_DECL_NSIDOMPROCESSINGINSTRUCTION
// nsIContent
- virtual PRBool IsContentOfType(PRUint32 aFlags) const;
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
virtual PRBool MayHaveFrame() const;
#ifdef DEBUG
diff --git a/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp b/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
index 6fbeb797f58..2b5595c4165 100644
--- a/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
+++ b/mozilla/content/xslt/src/xpath/txMozillaXPathTreeWalker.cpp
@@ -379,14 +379,14 @@ txXPathNodeUtils::getLocalName(const txXPathNode& aNode)
}
if (aNode.isContent()) {
- if (aNode.mContent->IsContentOfType(nsIContent::eELEMENT)) {
+ if (aNode.mContent->IsNodeOfType(nsINode::eELEMENT)) {
nsIAtom* localName = aNode.mContent->Tag();
NS_ADDREF(localName);
return localName;
}
- if (aNode.mContent->IsContentOfType(nsIContent::ePROCESSING_INSTRUCTION)) {
+ if (aNode.mContent->IsNodeOfType(nsINode::ePROCESSING_INSTRUCTION)) {
nsCOMPtr node = do_QueryInterface(aNode.mContent);
nsAutoString target;
node->GetNodeName(target);
@@ -414,20 +414,20 @@ txXPathNodeUtils::getLocalName(const txXPathNode& aNode, nsAString& aLocalName)
}
if (aNode.isContent()) {
- if (aNode.mContent->IsContentOfType(nsIContent::eELEMENT)) {
+ if (aNode.mContent->IsNodeOfType(nsINode::eELEMENT)) {
nsINodeInfo* nodeInfo = aNode.mContent->NodeInfo();
nodeInfo->GetLocalName(aLocalName);
// Check for html
if (nodeInfo->NamespaceEquals(kNameSpaceID_None) &&
- aNode.mContent->IsContentOfType(nsIContent::eHTML)) {
+ aNode.mContent->IsNodeOfType(nsINode::eHTML)) {
ToUpperCase(aLocalName);
}
return;
}
- if (aNode.mContent->IsContentOfType(nsIContent::ePROCESSING_INSTRUCTION)) {
+ if (aNode.mContent->IsNodeOfType(nsINode::ePROCESSING_INSTRUCTION)) {
// PIs don't have a nodeinfo but do have a name
nsCOMPtr node = do_QueryInterface(aNode.mContent);
node->GetNodeName(aLocalName);
@@ -445,7 +445,7 @@ txXPathNodeUtils::getLocalName(const txXPathNode& aNode, nsAString& aLocalName)
// Check for html
if (aNode.mContent->NodeInfo()->NamespaceEquals(kNameSpaceID_None) &&
- aNode.mContent->IsContentOfType(nsIContent::eHTML)) {
+ aNode.mContent->IsNodeOfType(nsINode::eHTML)) {
ToUpperCase(aLocalName);
}
}
@@ -461,20 +461,20 @@ txXPathNodeUtils::getNodeName(const txXPathNode& aNode, nsAString& aName)
}
if (aNode.isContent()) {
- if (aNode.mContent->IsContentOfType(nsIContent::eELEMENT)) {
+ if (aNode.mContent->IsNodeOfType(nsINode::eELEMENT)) {
nsINodeInfo* nodeInfo = aNode.mContent->NodeInfo();
nodeInfo->GetQualifiedName(aName);
// Check for html
if (nodeInfo->NamespaceEquals(kNameSpaceID_None) &&
- aNode.mContent->IsContentOfType(nsIContent::eHTML)) {
+ aNode.mContent->IsNodeOfType(nsINode::eHTML)) {
ToUpperCase(aName);
}
return;
}
- if (aNode.mContent->IsContentOfType(nsIContent::ePROCESSING_INSTRUCTION)) {
+ if (aNode.mContent->IsNodeOfType(nsINode::ePROCESSING_INSTRUCTION)) {
// PIs don't have a nodeinfo but do have a name
nsCOMPtr node = do_QueryInterface(aNode.mContent);
node->GetNodeName(aName);
@@ -491,7 +491,7 @@ txXPathNodeUtils::getNodeName(const txXPathNode& aNode, nsAString& aName)
// Check for html
if (aNode.mContent->NodeInfo()->NamespaceEquals(kNameSpaceID_None) &&
- aNode.mContent->IsContentOfType(nsIContent::eHTML)) {
+ aNode.mContent->IsNodeOfType(nsINode::eHTML)) {
ToUpperCase(aName);
}
}
@@ -542,10 +542,10 @@ static void appendTextContent(nsIContent* aElement, nsAString& aResult)
nsIContent* content = aElement->GetChildAt(0);
PRUint32 i = 0;
while (content) {
- if (content->IsContentOfType(nsIContent::eELEMENT)) {
+ if (content->IsNodeOfType(nsINode::eELEMENT)) {
appendTextContent(content, aResult);
}
- else if (content->IsContentOfType(nsIContent::eTEXT)) {
+ else if (content->IsNodeOfType(nsINode::eTEXT)) {
nsCOMPtr textContent = do_QueryInterface(content);
textContent->AppendTextTo(aResult);
}
@@ -576,13 +576,13 @@ txXPathNodeUtils::appendNodeValue(const txXPathNode& aNode, nsAString& aResult)
return;
}
- if (aNode.mContent->IsContentOfType(nsIContent::eELEMENT)) {
+ if (aNode.mContent->IsNodeOfType(nsINode::eELEMENT)) {
appendTextContent(aNode.mContent, aResult);
return;
}
- if (aNode.mContent->IsContentOfType(nsIContent::ePROCESSING_INSTRUCTION)) {
+ if (aNode.mContent->IsNodeOfType(nsINode::ePROCESSING_INSTRUCTION)) {
nsCOMPtr node = do_QueryInterface(aNode.mContent);
nsAutoString result;
diff --git a/mozilla/content/xslt/src/xpath/txXPathTreeWalker.h b/mozilla/content/xslt/src/xpath/txXPathTreeWalker.h
index fc66ad5f380..864c11ed8a7 100644
--- a/mozilla/content/xslt/src/xpath/txXPathTreeWalker.h
+++ b/mozilla/content/xslt/src/xpath/txXPathTreeWalker.h
@@ -265,7 +265,7 @@ txXPathNodeUtils::localNameEquals(const txXPathNode& aNode,
return localName == aLocalName;
#else
if (aNode.isContent() &&
- aNode.mContent->IsContentOfType(nsIContent::eELEMENT)) {
+ aNode.mContent->IsNodeOfType(nsINode::eELEMENT)) {
return aNode.mContent->NodeInfo()->Equals(aLocalName);
}
@@ -294,7 +294,7 @@ txXPathNodeUtils::isElement(const txXPathNode& aNode)
return aNode.mInner->getNodeType() == Node::ELEMENT_NODE;
#else
return aNode.isContent() &&
- aNode.mContent->IsContentOfType(nsIContent::eELEMENT);
+ aNode.mContent->IsNodeOfType(nsINode::eELEMENT);
#endif
}
@@ -318,7 +318,7 @@ txXPathNodeUtils::isProcessingInstruction(const txXPathNode& aNode)
return aNode.mInner->getNodeType() == Node::PROCESSING_INSTRUCTION_NODE;
#else
return aNode.isContent() &&
- aNode.mContent->IsContentOfType(nsIContent::ePROCESSING_INSTRUCTION);
+ aNode.mContent->IsNodeOfType(nsINode::ePROCESSING_INSTRUCTION);
#endif
}
@@ -330,7 +330,7 @@ txXPathNodeUtils::isComment(const txXPathNode& aNode)
return aNode.mInner->getNodeType() == Node::COMMENT_NODE;
#else
return aNode.isContent() &&
- aNode.mContent->IsContentOfType(nsIContent::eCOMMENT);
+ aNode.mContent->IsNodeOfType(nsINode::eCOMMENT);
#endif
}
@@ -342,7 +342,7 @@ txXPathNodeUtils::isText(const txXPathNode& aNode)
return aNode.mInner->getNodeType() == Node::TEXT_NODE;
#else
return aNode.isContent() &&
- aNode.mContent->IsContentOfType(nsIContent::eTEXT);
+ aNode.mContent->IsNodeOfType(nsINode::eTEXT);
#endif
}
diff --git a/mozilla/content/xul/content/src/nsXULElement.cpp b/mozilla/content/xul/content/src/nsXULElement.cpp
index ce228c0bdf9..43c827dd08e 100644
--- a/mozilla/content/xul/content/src/nsXULElement.cpp
+++ b/mozilla/content/xul/content/src/nsXULElement.cpp
@@ -763,7 +763,7 @@ nsXULElement::BindToTree(nsIDocument* aDocument, nsIContent* aParent,
// NS_PRECONDITION(!aParent || aDocument == aParent->GetCurrentDoc(),
// "aDocument must be current doc of aParent");
NS_PRECONDITION(!aParent ||
- (aParent->IsContentOfType(eXUL) && aDocument == nsnull) ||
+ (aParent->IsNodeOfType(eXUL) && aDocument == nsnull) ||
aDocument == aParent->GetCurrentDoc(),
"aDocument must be current doc of aParent");
// XXXbz we'd like to assert that GetCurrentDoc() is null, but the cloning
@@ -1693,7 +1693,7 @@ nsXULElement::PreHandleEvent(nsEventChainPreVisitor& aVisitor)
domDoc->GetElementById(command, getter_AddRefs(commandElt));
nsCOMPtr commandContent(do_QueryInterface(commandElt));
if (commandContent &&
- commandContent->IsContentOfType(nsIContent::eXUL) &&
+ commandContent->IsNodeOfType(nsINode::eXUL) &&
commandContent->Tag() == nsXULAtoms::command) {
// Reusing the event here, but DISPATCH_DONE/STARTED hack
// is needed.
@@ -2245,9 +2245,9 @@ nsXULElement::GetBindingParent() const
}
PRBool
-nsXULElement::IsContentOfType(PRUint32 aFlags) const
+nsXULElement::IsNodeOfType(PRUint32 aFlags) const
{
- return !(aFlags & ~(eELEMENT | eXUL));
+ return !(aFlags & ~(eCONTENT | eELEMENT | eXUL));
}
nsresult
diff --git a/mozilla/content/xul/content/src/nsXULElement.h b/mozilla/content/xul/content/src/nsXULElement.h
index 9c06f4022fa..b63ea0c391f 100644
--- a/mozilla/content/xul/content/src/nsXULElement.h
+++ b/mozilla/content/xul/content/src/nsXULElement.h
@@ -432,7 +432,7 @@ public:
/** Typesafe, non-refcounting cast from nsIContent. Cheaper than QI. **/
static nsXULElement* FromContent(nsIContent *aContent)
{
- if (aContent->IsContentOfType(eXUL))
+ if (aContent->IsNodeOfType(eXUL))
return NS_STATIC_CAST(nsXULElement*, aContent);
return nsnull;
}
@@ -514,7 +514,7 @@ public:
virtual void RemoveFocus(nsPresContext* aPresContext);
virtual nsIContent *GetBindingParent() const;
- virtual PRBool IsContentOfType(PRUint32 aFlags) const;
+ virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
virtual nsresult GetListenerManager(PRBool aCreateIfNotFound,
nsIEventListenerManager** aResult);
virtual PRBool IsFocusable(PRInt32 *aTabIndex = nsnull);
diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp
index 1cdd7b5f2b2..309539060be 100644
--- a/mozilla/content/xul/document/src/nsXULDocument.cpp
+++ b/mozilla/content/xul/document/src/nsXULDocument.cpp
@@ -1712,7 +1712,7 @@ NS_IMETHODIMP
nsXULDocument::AddSubtreeToDocument(nsIContent* aElement)
{
// From here on we only care about elements.
- if (!aElement->IsContentOfType(nsIContent::eELEMENT)) {
+ if (!aElement->IsNodeOfType(nsINode::eELEMENT)) {
return NS_OK;
}
@@ -1740,7 +1740,7 @@ NS_IMETHODIMP
nsXULDocument::RemoveSubtreeFromDocument(nsIContent* aElement)
{
// From here on we only care about elements.
- if (!aElement->IsContentOfType(nsIContent::eELEMENT)) {
+ if (!aElement->IsNodeOfType(nsINode::eELEMENT)) {
return NS_OK;
}
@@ -3868,7 +3868,7 @@ nsXULDocument::FindBroadcaster(nsIContent* aElement,
nsString& aAttribute,
nsIDOMElement** aBroadcaster)
{
- NS_ASSERTION(aElement->IsContentOfType(nsIContent::eELEMENT),
+ NS_ASSERTION(aElement->IsNodeOfType(nsINode::eELEMENT),
"Only pass elements into FindBroadcaster!");
nsresult rv;
diff --git a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp
index 047c2a15f3a..0701e5fc012 100644
--- a/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp
+++ b/mozilla/content/xul/templates/src/nsXULContentBuilder.cpp
@@ -766,7 +766,7 @@ nsXULContentBuilder::BuildContentFromTemplate(nsIContent *aTemplateNode,
// first element we've generated?
}
}
- else if (tmplKid->IsContentOfType(nsIContent::eTEXT)) {
+ else if (tmplKid->IsNodeOfType(nsINode::eTEXT)) {
nsCOMPtr tmplTextNode = do_QueryInterface(tmplKid);
if (!tmplTextNode) {
NS_ERROR("textnode not implementing nsIDOMNode??");
@@ -1491,7 +1491,7 @@ nsXULContentBuilder::IsOpen(nsIContent* aElement)
// Treat the 'root' element as always open, -unless- it's a
// menu/menupopup. We don't need to "fake" these as being open.
- if ((aElement == mRoot) && aElement->IsContentOfType(nsIContent::eXUL) &&
+ if ((aElement == mRoot) && aElement->IsNodeOfType(nsINode::eXUL) &&
(tag != nsXULAtoms::menu) &&
(tag != nsXULAtoms::menubutton) &&
(tag != nsXULAtoms::toolbarbutton) &&
@@ -1530,7 +1530,7 @@ nsXULContentBuilder::RemoveGeneratedContent(nsIContent* aElement)
// it should be moved outside the inner loop. Bug 297290.
if (element->NodeInfo()->Equals(nsXULAtoms::_template,
kNameSpaceID_XUL) ||
- !element->IsContentOfType(nsIContent::eELEMENT))
+ !element->IsNodeOfType(nsINode::eELEMENT))
continue;
// If the element is in the template map, then we
@@ -1565,7 +1565,7 @@ nsXULContentBuilder::IsLazyWidgetItem(nsIContent* aElement)
{
// Determine if this is a , , or