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 752045 - Handle document fragments correctly in *CanContain* methods; r=ehsan

Browse Source
This commit is contained in:
Ms2ger 2012-05-18 10:29:38 +02:00
parent 5bd79d4a20
commit 4bec394095
1 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3525,31 +3525,44 @@ nsEditor::IsBlockNode(nsINode *aNode)
bool
nsEditor::CanContain(nsIDOMNode* aParent, nsIDOMNode* aChild)
{
nsCOMPtr<dom::Element> parentElement = do_QueryInterface(aParent);
NS_ENSURE_TRUE(parentElement, false);
nsCOMPtr<nsIContent> parent = do_QueryInterface(aParent);
NS_ENSURE_TRUE(parent, false);
return TagCanContain(parentElement->Tag(), aChild);
switch (parent->NodeType()) {
case nsIDOMNode::ELEMENT_NODE:
case nsIDOMNode::DOCUMENT_FRAGMENT_NODE:
return TagCanContain(parent->Tag(), aChild);
}
return false;
}
bool
nsEditor::CanContainTag(nsIDOMNode* aParent, nsIAtom* aChildTag)
{
nsCOMPtr<dom::Element> parentElement = do_QueryInterface(aParent);
NS_ENSURE_TRUE(parentElement, false);
nsCOMPtr<nsIContent> parent = do_QueryInterface(aParent);
NS_ENSURE_TRUE(parent, false);
return TagCanContainTag(parentElement->Tag(), aChildTag);
switch (parent->NodeType()) {
case nsIDOMNode::ELEMENT_NODE:
case nsIDOMNode::DOCUMENT_FRAGMENT_NODE:
return TagCanContainTag(parent->Tag(), aChildTag);
}
return false;
}
bool
nsEditor::TagCanContain(nsIAtom* aParentTag, nsIDOMNode* aChild)
{
if (IsTextNode(aChild)) {
return TagCanContainTag(aParentTag, nsGkAtoms::textTagName);
}
nsCOMPtr<nsIContent> child = do_QueryInterface(aChild);
NS_ENSURE_TRUE(child, false);
nsCOMPtr<dom::Element> element = do_QueryInterface(aChild);
NS_ENSURE_TRUE(element, false);
return TagCanContainTag(aParentTag, element->Tag());
switch (child->NodeType()) {
case nsIDOMNode::TEXT_NODE:
case nsIDOMNode::ELEMENT_NODE:
case nsIDOMNode::DOCUMENT_FRAGMENT_NODE:
return TagCanContainTag(aParentTag, child->Tag());
}
return false;
}
bool