author | Aryeh Gregor <ayg@aryeh.name> |
Tue, 17 Apr 2012 13:18:08 +0300 | |
changeset 91845 | 52e2737720a568d2b378ee8429d2ce4d326ed67d |
parent 91844 | 975341acf9f1f384e4ffe6601566f9daa92ed168 |
child 91846 | 459b7d9d63d7191604d92848f651c775df5e0ad9 |
push id | 22480 |
push user | emorley@mozilla.com |
push date | Wed, 18 Apr 2012 00:48:48 +0000 |
treeherder | mozilla-central@93dfd98900ad [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ehsan |
bugs | 279330 |
milestone | 14.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/editor/txtsvc/src/nsTextServicesDocument.cpp +++ b/editor/txtsvc/src/nsTextServicesDocument.cpp @@ -1888,36 +1888,28 @@ nsTextServicesDocument::DidJoinNodes(nsI PRUint16 type; nsresult result; //**** KDEBUG **** // printf("** JoinNodes: 0x%.8x 0x%.8x 0x%.8x\n", aLeftNode, aRightNode, aParent); // fflush(stdout); //**** KDEBUG **** - // Make sure that both nodes are text nodes! + // Make sure that both nodes are text nodes -- otherwise we don't care. result = aLeftNode->GetNodeType(&type); - NS_ENSURE_SUCCESS(result, false); - - if (nsIDOMNode::TEXT_NODE != type) - { - NS_ERROR("JoinNode called with a non-text left node!"); - return NS_ERROR_FAILURE; + if (nsIDOMNode::TEXT_NODE != type) { + return NS_OK; } result = aRightNode->GetNodeType(&type); - NS_ENSURE_SUCCESS(result, false); - - if (nsIDOMNode::TEXT_NODE != type) - { - NS_ERROR("JoinNode called with a non-text right node!"); - return NS_ERROR_FAILURE; + if (nsIDOMNode::TEXT_NODE != type) { + return NS_OK; } // Note: The editor merges the contents of the left node into the // contents of the right. PRInt32 leftIndex = 0; PRInt32 rightIndex = 0; bool leftHasEntry = false;