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 847983 - Don't include empty elements at end of range; r=masayuki

Browse Source
This commit is contained in:
Jim Chen 2013-04-04 12:29:59 -04:00
parent 66f5f6f3d8
commit 7e822b7c08
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
content/events/src/nsContentEventHandler.cpp
View File

@ -388,6 +388,11 @@ nsContentEventHandler::SetRangeFromFlatTextOffset(
uint32_t nativeOffset = 0; uint32_t nativeOffset = 0;
uint32_t nativeEndOffset = aNativeOffset + aNativeLength; uint32_t nativeEndOffset = aNativeOffset + aNativeLength;
// When we clip the end offset to the end of the root element, set it to after
// the last valid node. This way we don't include any extraneous nodes, such
// as the bogus editor BR node, in our range.
nsINode *lastValidNode = mRootContent;
uint32_t lastValidOffset = 0;
bool startSet = false; bool startSet = false;
for (; !iter->IsDone(); iter->Next()) { for (; !iter->IsDone(); iter->Next()) {
nsINode* node = iter->GetCurrentNode(); nsINode* node = iter->GetCurrentNode();
@ -402,6 +407,8 @@ nsContentEventHandler::SetRangeFromFlatTextOffset(
if (nativeTextLength == 0) if (nativeTextLength == 0)
continue; continue;
lastValidNode = node->GetParent();
lastValidOffset = lastValidNode->IndexOf(node) + 1;
if (nativeOffset <= aNativeOffset && if (nativeOffset <= aNativeOffset &&
aNativeOffset < nativeOffset + nativeTextLength) { aNativeOffset < nativeOffset + nativeTextLength) {
nsCOMPtr<nsIDOMNode> domNode(do_QueryInterface(content)); nsCOMPtr<nsIDOMNode> domNode(do_QueryInterface(content));
@ -455,17 +462,16 @@ nsContentEventHandler::SetRangeFromFlatTextOffset(
nativeOffset += nativeTextLength; nativeOffset += nativeTextLength;
} }
if (nativeOffset < aNativeOffset) NS_ENSURE_TRUE(aNativeOffset <= nativeOffset, NS_ERROR_FAILURE);
return NS_ERROR_FAILURE;
nsCOMPtr<nsIDOMNode> domNode(do_QueryInterface(mRootContent)); nsCOMPtr<nsIDOMNode> domNode(do_QueryInterface(lastValidNode));
NS_ASSERTION(domNode, "lastContent doesn't have nsIDOMNode!"); NS_ASSERTION(domNode, "lastContent doesn't have nsIDOMNode!");
if (!startSet) { if (!startSet) {
MOZ_ASSERT(!mRootContent->IsNodeOfType(nsINode::eTEXT)); MOZ_ASSERT(!lastValidNode->IsNodeOfType(nsINode::eTEXT));
rv = aRange->SetStart(domNode, int32_t(mRootContent->GetChildCount())); rv = aRange->SetStart(domNode, int32_t(lastValidOffset));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
} }
rv = aRange->SetEnd(domNode, int32_t(mRootContent->GetChildCount())); rv = aRange->SetEnd(domNode, int32_t(lastValidOffset));
NS_ASSERTION(NS_SUCCEEDED(rv), "nsIDOMRange::SetEnd failed"); NS_ASSERTION(NS_SUCCEEDED(rv), "nsIDOMRange::SetEnd failed");
return rv; return rv;
} }