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 1053779 part 3 - Clean up nsEditor::CloneAttributes; r=ehsan

Browse Source
This commit is contained in:
Aryeh Gregor 2014-08-18 17:44:50 +03:00
parent 5b0aa4157d
commit b6ef649703
3 changed files with 46 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1368,7 +1368,7 @@ nsHTMLEditor::RebuildDocumentFromSource(const nsAString& aSourceString)
CreateElementWithDefaults(NS_LITERAL_STRING("div"));
NS_ENSURE_TRUE(divElement, NS_ERROR_FAILURE);
CloneAttributes(bodyElement->AsDOMNode(), divElement->AsDOMNode());
CloneAttributes(bodyElement, divElement);
return BeginningOfDocument();
}
@ -1404,11 +1404,10 @@ nsHTMLEditor::RebuildDocumentFromSource(const nsAString& aSourceString)
NS_ENSURE_TRUE(docfrag, NS_ERROR_NULL_POINTER);
nsCOMPtr<nsIContent> child = docfrag->GetFirstChild();
NS_ENSURE_TRUE(child, NS_ERROR_NULL_POINTER);
NS_ENSURE_TRUE(child && child->IsElement(), NS_ERROR_NULL_POINTER);
// Copy all attributes from the div child to current body element
res = CloneAttributes(bodyElement->AsDOMNode(), child->AsDOMNode());
NS_ENSURE_SUCCESS(res, res);
CloneAttributes(bodyElement, child->AsElement());
// place selection at first editable content
return BeginningOfDocument();

110
editor/libeditor/nsEditor.cpp
View File

@ -1548,8 +1548,7 @@ nsEditor::ReplaceContainer(Element* aOldContainer,
NS_ENSURE_SUCCESS(res, nullptr);
}
if (aCloneAttributes == eCloneAttributes) {
res = CloneAttributes(ret->AsDOMNode(), aOldContainer->AsDOMNode());
NS_ENSURE_SUCCESS(res, nullptr);
CloneAttributes(ret, aOldContainer);
}
// notify our internal selection state listener
@ -2218,87 +2217,60 @@ nsEditor::CloneAttribute(const nsAString & aAttribute,
// Objects must be DOM elements
NS_IMETHODIMP
nsEditor::CloneAttributes(nsIDOMNode *aDestNode, nsIDOMNode *aSourceNode)
nsEditor::CloneAttributes(nsIDOMNode* aDest, nsIDOMNode* aSource)
{
NS_ENSURE_TRUE(aDestNode && aSourceNode, NS_ERROR_NULL_POINTER);
NS_ENSURE_TRUE(aDest && aSource, NS_ERROR_NULL_POINTER);
nsCOMPtr<nsIDOMElement> destElement = do_QueryInterface(aDestNode);
nsCOMPtr<nsIDOMElement> sourceElement = do_QueryInterface(aSourceNode);
NS_ENSURE_TRUE(destElement && sourceElement, NS_ERROR_NO_INTERFACE);
nsCOMPtr<Element> dest = do_QueryInterface(aDest);
nsCOMPtr<Element> source = do_QueryInterface(aSource);
NS_ENSURE_TRUE(dest && source, NS_ERROR_NO_INTERFACE);
nsCOMPtr<nsIDOMMozNamedAttrMap> sourceAttributes;
sourceElement->GetAttributes(getter_AddRefs(sourceAttributes));
nsCOMPtr<nsIDOMMozNamedAttrMap> destAttributes;
destElement->GetAttributes(getter_AddRefs(destAttributes));
NS_ENSURE_TRUE(sourceAttributes && destAttributes, NS_ERROR_FAILURE);
CloneAttributes(dest, source);
return NS_OK;
}
void
nsEditor::CloneAttributes(Element* aDest, Element* aSource)
{
MOZ_ASSERT(aDest && aSource);
nsAutoEditBatch beginBatching(this);
// Use transaction system for undo only if destination
// is already in the document
nsCOMPtr<nsIDOMNode> p = aDestNode;
nsCOMPtr<nsIDOMNode> rootNode = do_QueryInterface(GetRoot());
NS_ENSURE_TRUE(rootNode, NS_ERROR_NULL_POINTER);
bool destInBody = true;
while (p && p != rootNode)
{
nsCOMPtr<nsIDOMNode> tmp;
if (NS_FAILED(p->GetParentNode(getter_AddRefs(tmp))) || !tmp)
{
destInBody = false;
break;
}
p = tmp;
}
uint32_t sourceCount;
sourceAttributes->GetLength(&sourceCount);
uint32_t destCount;
destAttributes->GetLength(&destCount);
nsCOMPtr<nsIDOMAttr> attr;
// Use transaction system for undo only if destination is already in the
// document
NS_ENSURE_TRUE(GetRoot(), );
bool destInBody = GetRoot()->Contains(aDest);
// Clear existing attributes
for (uint32_t i = 0; i < destCount; i++) {
// always remove item number 0 (first item in list)
if (NS_SUCCEEDED(destAttributes->Item(0, getter_AddRefs(attr))) && attr) {
nsString str;
if (NS_SUCCEEDED(attr->GetName(str))) {
if (destInBody) {
RemoveAttribute(destElement, str);
} else {
destElement->RemoveAttribute(str);
}
}
nsRefPtr<nsDOMAttributeMap> destAttributes = aDest->Attributes();
while (nsRefPtr<Attr> attr = destAttributes->Item(0)) {
if (destInBody) {
RemoveAttribute(static_cast<nsIDOMElement*>(GetAsDOMNode(aDest)),
attr->NodeName());
} else {
ErrorResult ignored;
aDest->RemoveAttribute(attr->NodeName(), ignored);
}
}
nsresult result = NS_OK;
// Set just the attributes that the source element has
for (uint32_t i = 0; i < sourceCount; i++)
{
if (NS_SUCCEEDED(sourceAttributes->Item(i, getter_AddRefs(attr))) && attr) {
nsString sourceAttrName;
if (NS_SUCCEEDED(attr->GetName(sourceAttrName))) {
nsString sourceAttrValue;
/* Presence of an attribute in the named node map indicates that it was
* set on the element even if it has no value.
*/
if (NS_SUCCEEDED(attr->GetValue(sourceAttrValue))) {
if (destInBody) {
result = SetAttributeOrEquivalent(destElement, sourceAttrName, sourceAttrValue, false);
} else {
// the element is not inserted in the document yet, we don't want to put a
// transaction on the UndoStack
result = SetAttributeOrEquivalent(destElement, sourceAttrName, sourceAttrValue, true);
}
} else {
// Do we ever get here?
}
}
nsRefPtr<nsDOMAttributeMap> sourceAttributes = aSource->Attributes();
uint32_t sourceCount = sourceAttributes->Length();
for (uint32_t i = 0; i < sourceCount; i++) {
nsRefPtr<Attr> attr = sourceAttributes->Item(i);
nsAutoString value;
attr->GetValue(value);
if (destInBody) {
SetAttributeOrEquivalent(static_cast<nsIDOMElement*>(GetAsDOMNode(aDest)),
attr->NodeName(), value, false);
} else {
// The element is not inserted in the document yet, we don't want to put
// a transaction on the UndoStack
SetAttributeOrEquivalent(static_cast<nsIDOMElement*>(GetAsDOMNode(aDest)),
attr->NodeName(), value, true);
}
}
return result;
}

2
editor/libeditor/nsEditor.h
View File

@ -231,6 +231,8 @@ public:
nsIAtom* aAttribute = nullptr,
const nsAString* aValue = nullptr,
ECloneAttributes aCloneAttributes = eDontCloneAttributes);
void CloneAttributes(mozilla::dom::Element* aDest,
mozilla::dom::Element* aSource);
nsresult RemoveContainer(nsINode* aNode);
nsresult RemoveContainer(nsIDOMNode *inNode);