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 1123505 - part 1, Reset mStart/EndDepth before serializing each range. Use mStartDepth of the first range and mEndDepth of the last range for multi-range Selections. r=smaug

Browse Source
This commit is contained in:
Mats Palmgren 2015-02-02 22:34:17 +00:00
parent 3a6334dffd
commit db49d61ba7
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/base/nsDocumentEncoder.cpp
View File

@ -971,6 +971,7 @@ nsDocumentEncoder::SerializeRangeToString(nsRange *aRange,
NS_ENSURE_TRUE(endParent, NS_ERROR_FAILURE);
int32_t endOffset = aRange->EndOffset();
mStartDepth = mEndDepth = 0;
mCommonAncestors.Clear();
mStartNodes.Clear();
mStartOffsets.Clear();
@ -1071,6 +1072,7 @@ nsDocumentEncoder::EncodeToStringWithMaxLength(uint32_t aMaxLength,
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDOMNode> node, prevNode;
uint32_t firstRangeStartDepth = 0;
for (i = 0; i < count; i++) {
mSelection->GetRangeAt(i, getter_AddRefs(range));
@ -1120,7 +1122,11 @@ nsDocumentEncoder::EncodeToStringWithMaxLength(uint32_t aMaxLength,
nsRange* r = static_cast<nsRange*>(range.get());
rv = SerializeRangeToString(r, output);
NS_ENSURE_SUCCESS(rv, rv);
if (i == 0) {
firstRangeStartDepth = mStartDepth;
}
}
mStartDepth = firstRangeStartDepth;
if (prevNode) {
nsCOMPtr<nsINode> p = do_QueryInterface(prevNode);