corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1318479 part 2. Remove uses of nsIDOMNode::AppendChild in editor. r=ehsan

Browse Source
This commit is contained in:
Boris Zbarsky
2016-11-18 16:38:29 -05:00
parent d9b3b7831d
commit d76e1fb625
3 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
editor/libeditor/HTMLTableEditor.cpp
View File

@@ -643,26 +643,23 @@ HTMLEditor::InsertTableRow(int32_t aNumber,
}
}
nsCOMPtr<nsINode> cellNodeForRowParent = do_QueryInterface(cellForRowParent);
if (cellsInRow > 0) {
// The row parent and offset where we will insert new row
nsCOMPtr<nsIDOMNode> parentOfRow;
int32_t newRowOffset;
NS_NAMED_LITERAL_STRING(trStr, "tr");
if (!cellForRowParent) {
if (!cellNodeForRowParent) {
return NS_ERROR_FAILURE;
}
nsCOMPtr<nsIDOMElement> parentRow;
rv = GetElementOrParentByTagName(trStr, cellForRowParent,
getter_AddRefs(parentRow));
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<Element> parentRow =
GetElementOrParentByTagName(trStr, cellNodeForRowParent);
NS_ENSURE_TRUE(parentRow, NS_ERROR_NULL_POINTER);
parentRow->GetParentNode(getter_AddRefs(parentOfRow));
// The row parent and offset where we will insert new row
nsCOMPtr<nsINode> parentOfRow = parentRow->GetParentNode();
NS_ENSURE_TRUE(parentOfRow, NS_ERROR_NULL_POINTER);
newRowOffset = GetChildOffset(parentRow, parentOfRow);
int32_t newRowOffset = parentOfRow->IndexOf(parentRow);
// Adjust for when adding past the end
if (aAfter && startRowIndex >= rowCount) {
@@ -671,28 +668,27 @@ HTMLEditor::InsertTableRow(int32_t aNumber,
for (int32_t row = 0; row < aNumber; row++) {
// Create a new row
nsCOMPtr<nsIDOMElement> newRow;
rv = CreateElementWithDefaults(trStr, getter_AddRefs(newRow));
if (NS_SUCCEEDED(rv)) {
NS_ENSURE_TRUE(newRow, NS_ERROR_FAILURE);
nsCOMPtr<Element> newRow = CreateElementWithDefaults(trStr);
NS_ENSURE_TRUE(newRow, NS_ERROR_FAILURE);
for (int32_t i = 0; i < cellsInRow; i++) {
nsCOMPtr<nsIDOMElement> newCell;
rv = CreateElementWithDefaults(NS_LITERAL_STRING("td"),
getter_AddRefs(newCell));
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_TRUE(newCell, NS_ERROR_FAILURE);
for (int32_t i = 0; i < cellsInRow; i++) {
nsCOMPtr<Element> newCell =
CreateElementWithDefaults(NS_LITERAL_STRING("td"));
NS_ENSURE_TRUE(newCell, NS_ERROR_FAILURE);
// Don't use transaction system yet! (not until entire row is inserted)
nsCOMPtr<nsIDOMNode>resultNode;
rv = newRow->AppendChild(newCell, getter_AddRefs(resultNode));
NS_ENSURE_SUCCESS(rv, rv);
// Don't use transaction system yet! (not until entire row is
// inserted)
ErrorResult result;
newRow->AppendChild(*newCell, result);
if (NS_WARN_IF(result.Failed())) {
return result.StealNSResult();
}
// Use transaction system to insert the entire row+cells
// (Note that rows are inserted at same childoffset each time)
rv = InsertNode(newRow, parentOfRow, newRowOffset);
NS_ENSURE_SUCCESS(rv, rv);
}
// Use transaction system to insert the entire row+cells
// (Note that rows are inserted at same childoffset each time)
rv = InsertNode(*newRow, *parentOfRow, newRowOffset);
NS_ENSURE_SUCCESS(rv, rv);
}
}
// XXX This might be the result of the last call of