wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 750079 - Part b: Return nsIContent from GetPriorHTMLSibling/GetNextHTMLSibling; r=ehsan

Browse Source
This commit is contained in:
Ms2ger 2012-05-05 11:00:06 +02:00
parent 93937bfab0
commit b6b5f01a68
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/libeditor/html/nsHTMLEditor.cpp
View File

@ -4214,7 +4214,7 @@ nsHTMLEditor::RemoveBlockContainer(nsIDOMNode *inNode)
// GetPriorHTMLSibling: returns the previous editable sibling, if there is // GetPriorHTMLSibling: returns the previous editable sibling, if there is
// one within the parent // one within the parent
// //
nsINode* nsIContent*
nsHTMLEditor::GetPriorHTMLSibling(nsINode* aNode) nsHTMLEditor::GetPriorHTMLSibling(nsINode* aNode)
{ {
MOZ_ASSERT(aNode); MOZ_ASSERT(aNode);
@ -4247,7 +4247,7 @@ nsHTMLEditor::GetPriorHTMLSibling(nsIDOMNode *inNode, nsCOMPtr<nsIDOMNode> *outN
// one within the parent. just like above routine but // one within the parent. just like above routine but
// takes a parent/offset instead of a node. // takes a parent/offset instead of a node.
// //
nsINode* nsIContent*
nsHTMLEditor::GetPriorHTMLSibling(nsINode* aParent, PRInt32 aOffset) nsHTMLEditor::GetPriorHTMLSibling(nsINode* aParent, PRInt32 aOffset)
{ {
MOZ_ASSERT(aParent); MOZ_ASSERT(aParent);
@ -4279,7 +4279,7 @@ nsHTMLEditor::GetPriorHTMLSibling(nsIDOMNode *inParent, PRInt32 inOffset, nsCOMP
// GetNextHTMLSibling: returns the next editable sibling, if there is // GetNextHTMLSibling: returns the next editable sibling, if there is
// one within the parent // one within the parent
// //
nsINode* nsIContent*
nsHTMLEditor::GetNextHTMLSibling(nsINode* aNode) nsHTMLEditor::GetNextHTMLSibling(nsINode* aNode)
{ {
MOZ_ASSERT(aNode); MOZ_ASSERT(aNode);
@ -4311,7 +4311,7 @@ nsHTMLEditor::GetNextHTMLSibling(nsIDOMNode *inNode, nsCOMPtr<nsIDOMNode> *outNo
// GetNextHTMLSibling: returns the next editable sibling, if there is // GetNextHTMLSibling: returns the next editable sibling, if there is
// one within the parent. just like above routine but // one within the parent. just like above routine but
// takes a parent/offset instead of a node. // takes a parent/offset instead of a node.
nsINode* nsIContent*
nsHTMLEditor::GetNextHTMLSibling(nsINode* aParent, PRInt32 aOffset) nsHTMLEditor::GetNextHTMLSibling(nsINode* aParent, PRInt32 aOffset)
{ {
MOZ_ASSERT(aParent); MOZ_ASSERT(aParent);

8
editor/libeditor/html/nsHTMLEditor.h
View File

@ -719,13 +719,13 @@ protected:
bool IsOnlyAttribute(const nsIContent* aElement, const nsAString& aAttribute); bool IsOnlyAttribute(const nsIContent* aElement, const nsAString& aAttribute);
nsresult RemoveBlockContainer(nsIDOMNode *inNode); nsresult RemoveBlockContainer(nsIDOMNode *inNode);
nsINode* GetPriorHTMLSibling(nsINode* aNode); nsIContent* GetPriorHTMLSibling(nsINode* aNode);
nsresult GetPriorHTMLSibling(nsIDOMNode *inNode, nsCOMPtr<nsIDOMNode> *outNode); nsresult GetPriorHTMLSibling(nsIDOMNode *inNode, nsCOMPtr<nsIDOMNode> *outNode);
nsINode* GetPriorHTMLSibling(nsINode* aParent, PRInt32 aOffset); nsIContent* GetPriorHTMLSibling(nsINode* aParent, PRInt32 aOffset);
nsresult GetPriorHTMLSibling(nsIDOMNode *inParent, PRInt32 inOffset, nsCOMPtr<nsIDOMNode> *outNode); nsresult GetPriorHTMLSibling(nsIDOMNode *inParent, PRInt32 inOffset, nsCOMPtr<nsIDOMNode> *outNode);
nsINode* GetNextHTMLSibling(nsINode* aNode); nsIContent* GetNextHTMLSibling(nsINode* aNode);
nsresult GetNextHTMLSibling(nsIDOMNode *inNode, nsCOMPtr<nsIDOMNode> *outNode); nsresult GetNextHTMLSibling(nsIDOMNode *inNode, nsCOMPtr<nsIDOMNode> *outNode);
nsINode* GetNextHTMLSibling(nsINode* aParent, PRInt32 aOffset); nsIContent* GetNextHTMLSibling(nsINode* aParent, PRInt32 aOffset);
nsresult GetNextHTMLSibling(nsIDOMNode *inParent, PRInt32 inOffset, nsCOMPtr<nsIDOMNode> *outNode); nsresult GetNextHTMLSibling(nsIDOMNode *inParent, PRInt32 inOffset, nsCOMPtr<nsIDOMNode> *outNode);
nsresult GetPriorHTMLNode(nsIDOMNode *inNode, nsCOMPtr<nsIDOMNode> *outNode, bool bNoBlockCrossing = false); nsresult GetPriorHTMLNode(nsIDOMNode *inNode, nsCOMPtr<nsIDOMNode> *outNode, bool bNoBlockCrossing = false);
nsresult GetPriorHTMLNode(nsIDOMNode *inParent, PRInt32 inOffset, nsCOMPtr<nsIDOMNode> *outNode, bool bNoBlockCrossing = false); nsresult GetPriorHTMLNode(nsIDOMNode *inParent, PRInt32 inOffset, nsCOMPtr<nsIDOMNode> *outNode, bool bNoBlockCrossing = false);