Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1145395 - Use the local fragment variable rather than *outFragNode; r=ehsan

Browse Source
This commit is contained in:
Ms2ger 2015-05-13 17:58:25 +02:00
parent 5829c12a8a
commit e72fde474e
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/libeditor/nsHTMLDataTransfer.cpp
View File

@ -2050,20 +2050,19 @@ nsresult nsHTMLEditor::CreateDOMFragmentFromPaste(const nsAString &aInputString,
doc,
getter_AddRefs(fragment),
aTrustedInput);
*outFragNode = fragment;
NS_ENSURE_SUCCESS(rv, rv);
NS_ENSURE_TRUE(*outFragNode, NS_ERROR_FAILURE);
NS_ENSURE_TRUE(fragment, NS_ERROR_FAILURE);
RemoveBodyAndHead(*outFragNode);
RemoveBodyAndHead(fragment);
if (contextAsNode) {
// unite the two trees
nsCOMPtr<nsIDOMNode> junk;
contextLeaf->AppendChild(*outFragNode, getter_AddRefs(junk));
*outFragNode = contextAsNode;
contextLeaf->AppendChild(fragment, getter_AddRefs(junk));
fragment = contextAsNode;
}
rv = StripFormattingNodes(*outFragNode, true);
rv = StripFormattingNodes(fragment, true);
NS_ENSURE_SUCCESS(rv, rv);
// If there was no context, then treat all of the data we did get as the
@ -2071,9 +2070,10 @@ nsresult nsHTMLEditor::CreateDOMFragmentFromPaste(const nsAString &aInputString,
if (contextLeaf) {
*outEndNode = *outStartNode = contextLeaf;
} else {
*outEndNode = *outStartNode = *outFragNode;
*outEndNode = *outStartNode = fragment;
}
*outFragNode = fragment.forget();
*outStartOffset = 0;
// get the infoString contents