зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1318096 part 9. Remove XPCOM parentnode/childnode APIs. r=froydnj
This commit is contained in:
Родитель
e13d617b08
Коммит
061d3629f1
|
@ -132,13 +132,6 @@ DocumentType::GetInternalSubset(nsAString& aInternalSubset)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
DocumentType::MozRemove()
|
||||
{
|
||||
Remove();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsGenericDOMDataNode*
|
||||
DocumentType::CloneDataNode(mozilla::dom::NodeInfo *aNodeInfo, bool aCloneText) const
|
||||
{
|
||||
|
|
|
@ -1745,60 +1745,5 @@ NS_IMETHOD GetElementsByClassName(const nsAString& classes, \
|
|||
override \
|
||||
{ \
|
||||
return Element::GetElementsByClassName(classes, _retval); \
|
||||
} \
|
||||
NS_IMETHOD GetChildElements(nsIDOMNodeList** aChildElements) final override \
|
||||
{ \
|
||||
nsIHTMLCollection* list = FragmentOrElement::Children(); \
|
||||
return CallQueryInterface(list, aChildElements); \
|
||||
} \
|
||||
NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) final \
|
||||
override \
|
||||
{ \
|
||||
Element* element = Element::GetFirstElementChild(); \
|
||||
if (!element) { \
|
||||
*aFirstElementChild = nullptr; \
|
||||
return NS_OK; \
|
||||
} \
|
||||
return CallQueryInterface(element, aFirstElementChild); \
|
||||
} \
|
||||
NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) final \
|
||||
override \
|
||||
{ \
|
||||
Element* element = Element::GetLastElementChild(); \
|
||||
if (!element) { \
|
||||
*aLastElementChild = nullptr; \
|
||||
return NS_OK; \
|
||||
} \
|
||||
return CallQueryInterface(element, aLastElementChild); \
|
||||
} \
|
||||
NS_IMETHOD GetPreviousElementSibling(nsIDOMElement** aPreviousElementSibling) \
|
||||
final override \
|
||||
{ \
|
||||
Element* element = Element::GetPreviousElementSibling(); \
|
||||
if (!element) { \
|
||||
*aPreviousElementSibling = nullptr; \
|
||||
return NS_OK; \
|
||||
} \
|
||||
return CallQueryInterface(element, aPreviousElementSibling); \
|
||||
} \
|
||||
NS_IMETHOD GetNextElementSibling(nsIDOMElement** aNextElementSibling) \
|
||||
final override \
|
||||
{ \
|
||||
Element* element = Element::GetNextElementSibling(); \
|
||||
if (!element) { \
|
||||
*aNextElementSibling = nullptr; \
|
||||
return NS_OK; \
|
||||
} \
|
||||
return CallQueryInterface(element, aNextElementSibling); \
|
||||
} \
|
||||
NS_IMETHOD GetChildElementCount(uint32_t* aChildElementCount) final override \
|
||||
{ \
|
||||
*aChildElementCount = Element::ChildElementCount(); \
|
||||
return NS_OK; \
|
||||
} \
|
||||
NS_IMETHOD MozRemove() final override \
|
||||
{ \
|
||||
nsINode::Remove(); \
|
||||
return NS_OK; \
|
||||
}
|
||||
#endif // mozilla_dom_Element_h__
|
||||
|
|
|
@ -235,13 +235,6 @@ nsGenericDOMDataNode::SubstringData(uint32_t aStart, uint32_t aCount,
|
|||
}
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsGenericDOMDataNode::MozRemove()
|
||||
{
|
||||
Remove();
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
//----------------------------------------------------------------------
|
||||
|
||||
nsresult
|
||||
|
|
|
@ -79,7 +79,6 @@ public:
|
|||
nsresult DeleteData(uint32_t aOffset, uint32_t aCount);
|
||||
nsresult ReplaceData(uint32_t aOffset, uint32_t aCount,
|
||||
const nsAString& aArg);
|
||||
NS_IMETHOD MozRemove();
|
||||
|
||||
// nsINode methods
|
||||
virtual uint32_t GetChildCount() const override;
|
||||
|
|
|
@ -36,7 +36,4 @@ interface nsIDOMCharacterData : nsIDOMNode
|
|||
in unsigned long count,
|
||||
in DOMString arg)
|
||||
raises(DOMException);
|
||||
|
||||
[binaryname(MozRemove)]
|
||||
void remove();
|
||||
};
|
||||
|
|
|
@ -22,7 +22,4 @@ interface nsIDOMDocumentType : nsIDOMNode
|
|||
readonly attribute DOMString publicId;
|
||||
readonly attribute DOMString systemId;
|
||||
readonly attribute DOMString internalSubset;
|
||||
|
||||
[binaryname(MozRemove)]
|
||||
void remove();
|
||||
};
|
||||
|
|
|
@ -70,25 +70,4 @@ interface nsIDOMElement : nsIDOMNode
|
|||
* space-separated string.
|
||||
*/
|
||||
nsIDOMHTMLCollection getElementsByClassName(in DOMString classes);
|
||||
|
||||
/**
|
||||
* Returns a live nsIDOMNodeList of the current child elements.
|
||||
*/
|
||||
[binaryname(ChildElements)]
|
||||
readonly attribute nsIDOMNodeList children;
|
||||
/**
|
||||
* Similar as the attributes on nsIDOMNode, but navigates just elements
|
||||
* rather than all nodes.
|
||||
*/
|
||||
readonly attribute nsIDOMElement firstElementChild;
|
||||
readonly attribute nsIDOMElement lastElementChild;
|
||||
readonly attribute nsIDOMElement previousElementSibling;
|
||||
readonly attribute nsIDOMElement nextElementSibling;
|
||||
/**
|
||||
* Returns the number of child nodes that are nsIDOMElements.
|
||||
*/
|
||||
readonly attribute unsigned long childElementCount;
|
||||
|
||||
[binaryname(MozRemove)]
|
||||
void remove();
|
||||
};
|
||||
|
|
Загрузка…
Ссылка в новой задаче