зеркало из https://github.com/mozilla/gecko-dev.git
Bug 804784 - Crash with range, normalize. r=smaug
This commit is contained in:
Mats Palmgren
Родитель
e446981985
Коммит
3c6ed39490
|
|
@ -500,7 +500,27 @@ nsRange::CharacterDataChanged(nsIDocument* aDocument,
|
|||
newRoot = IsValidBoundary(newEndNode);
|
||||
}
|
||||
}
|
||||
// When the removed text node's parent is one of our boundary nodes we may
|
||||
// need to adjust the offset to account for the removed node. However,
|
||||
// there will also be a ContentRemoved notification later so the only cases
|
||||
// we need to handle here is when the removed node is the text node after
|
||||
// the boundary. (The m*Offset > 0 check is an optimization - a boundary
|
||||
// point before the first child is never affected by normalize().)
|
||||
nsINode* parentNode = aContent->GetParentNode();
|
||||
if (parentNode == mStartParent && mStartOffset > 0 &&
|
||||
mStartOffset < parentNode->GetChildCount() &&
|
||||
removed == parentNode->GetChildAt(mStartOffset)) {
|
||||
newStartNode = aContent;
|
||||
newStartOffset = aInfo->mChangeStart;
|
||||
}
|
||||
if (parentNode == mEndParent && mEndOffset > 0 &&
|
||||
mEndOffset < parentNode->GetChildCount() &&
|
||||
removed == parentNode->GetChildAt(mEndOffset)) {
|
||||
newEndNode = aContent;
|
||||
newEndOffset = aInfo->mChangeEnd;
|
||||
}
|
||||
}
|
||||
|
||||
if (newStartNode || newEndNode) {
|
||||
if (!newStartNode) {
|
||||
newStartNode = mStartParent;
|
||||
|
|
|
|||
|
|
@ -594,6 +594,7 @@ MOCHITEST_FILES_B = \
|
|||
test_bug804395.html \
|
||||
test_bug809003.html \
|
||||
test_textnode_split_in_selection.html \
|
||||
test_textnode_normalize_in_selection.html \
|
||||
$(NULL)
|
||||
|
||||
# OOP tests don't work on Windows (bug 763081) or native-fennec
|
||||
|
|
|
|||
|
|
@ -0,0 +1,201 @@
|
|||
<!DOCTYPE HTML>
|
||||
<html>
|
||||
<!--
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=804784
|
||||
-->
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<title>Test for Bug 804784</title>
|
||||
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
|
||||
</head>
|
||||
<body>
|
||||
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=804784">Mozilla Bug 804784</a>
|
||||
<p id="display"></p>
|
||||
<div id="content" style="display: none">
|
||||
|
||||
</div>
|
||||
<pre id="test">
|
||||
<script type="application/javascript">
|
||||
|
||||
/** Test for Bug 804784 **/
|
||||
|
||||
var sel = document.getSelection();
|
||||
var flush = true;
|
||||
var dry = true;
|
||||
var run = "";
|
||||
var empty_range;
|
||||
var empty_first_text_range;
|
||||
var empty_last_text_range;
|
||||
var full_range;
|
||||
|
||||
function check(range, expected, test)
|
||||
{
|
||||
is(""+range, expected, test);
|
||||
is(""+empty_range, "", "empty range test after: "+test);
|
||||
is(""+empty_first_text_range, "", "empty first text range test after: "+test);
|
||||
if (empty_last_text_range) is(""+empty_last_text_range, "", "empty last text range test after: "+test);
|
||||
is(""+full_range, full_range.startContainer.textContent, "full range test after: "+test);
|
||||
}
|
||||
|
||||
function newDiv()
|
||||
{
|
||||
var div = document.createElement('div');
|
||||
for (var i = 0; i < arguments.length; ++i) {
|
||||
div.appendChild(document.createTextNode(arguments[i]));
|
||||
}
|
||||
document.body.appendChild(div)
|
||||
empty_range = document.createRange();
|
||||
empty_range.setStart(div,0);
|
||||
empty_range.setEnd(div,0);
|
||||
var firstTextNode = div.childNodes[0];
|
||||
var lastTextNode = div.childNodes[div.childNodes.length - 1];
|
||||
empty_first_text_range = document.createRange();
|
||||
empty_first_text_range.setStart(firstTextNode,0);
|
||||
empty_first_text_range.setEnd(firstTextNode,0);
|
||||
empty_last_text_range = null;
|
||||
if (firstTextNode != lastTextNode) {
|
||||
empty_last_text_range = document.createRange();
|
||||
empty_last_text_range.setStart(lastTextNode,0);
|
||||
empty_last_text_range.setEnd(lastTextNode,0);
|
||||
}
|
||||
full_range = document.createRange();
|
||||
full_range.setStart(div,0);
|
||||
full_range.setEnd(div,div.childNodes.length);
|
||||
return div;
|
||||
}
|
||||
|
||||
function selEnd(div,child,index,s)
|
||||
{
|
||||
var start = div.childNodes[child];
|
||||
var r = document.createRange();
|
||||
sel.addRange(r);
|
||||
r.setStart(start, index);
|
||||
r.setEnd(div, div.childNodes.length);
|
||||
if (!dry) div.normalize();
|
||||
check(r,s,run+" selEnd "+child+","+index);
|
||||
}
|
||||
|
||||
function selStart(div,child,index,s)
|
||||
{
|
||||
if (flush) document.body.getClientRects();
|
||||
var start = div.childNodes[child];
|
||||
var r = document.createRange();
|
||||
sel.addRange(r);
|
||||
r.setStart(div, 0);
|
||||
r.setEnd(start, index);
|
||||
if (!dry) div.normalize();
|
||||
check(r,s,run+" selStart "+child+","+index);
|
||||
}
|
||||
|
||||
function selMiddleStart(div,child,index,s)
|
||||
{
|
||||
if (flush) document.body.getClientRects();
|
||||
var start = div.childNodes[child];
|
||||
var r = document.createRange();
|
||||
sel.addRange(r);
|
||||
r.setStart(div, 1);
|
||||
r.setEnd(start, index);
|
||||
div.normalize();
|
||||
check(r,s,run+" selMiddleStart "+child+","+index);
|
||||
}
|
||||
|
||||
function selMiddleEnd(div,child,index,s)
|
||||
{
|
||||
if (flush) document.body.getClientRects();
|
||||
var start = div.childNodes[child];
|
||||
var r = document.createRange();
|
||||
sel.addRange(r);
|
||||
r.setStart(start, index);
|
||||
r.setEnd(div, 2);
|
||||
if (!dry) div.normalize();
|
||||
check(r,s,run+" selMiddleEnd "+child+","+index);
|
||||
}
|
||||
|
||||
function mergeBefore(div,child,index,s)
|
||||
{
|
||||
if (flush) document.body.getClientRects();
|
||||
var start = div.childNodes[child];
|
||||
var r = document.createRange();
|
||||
sel.addRange(r);
|
||||
r.setStart(div, 1);
|
||||
r.setEnd(start, index);
|
||||
if (!dry) div.normalize();
|
||||
check(r,s,run+" mergeBefore "+child+","+index);
|
||||
}
|
||||
|
||||
function runTests(s)
|
||||
{
|
||||
run = s+":";
|
||||
selEnd(newDiv('111'), 0,0,'111');
|
||||
selEnd(newDiv('111'), 0,1,'11');
|
||||
selEnd(newDiv('111'), 0,2,'1');
|
||||
selEnd(newDiv(''), 0,0,'');
|
||||
selEnd(newDiv('',''), 1,0,'');
|
||||
selEnd(newDiv('','',''), 1,0,'');
|
||||
selEnd(newDiv('111','222'), 0,1,'11222');
|
||||
selEnd(newDiv('111','222'), 0,2,'1222');
|
||||
selEnd(newDiv('111','222'), 1,1,'22');
|
||||
selEnd(newDiv('','222'), 1,2,'2');
|
||||
selEnd(newDiv('111',''), 0,1,'11');
|
||||
selEnd(newDiv('111','222'), 1,2,'2');
|
||||
selEnd(newDiv('111','222','333'), 1,1,'22333');
|
||||
selEnd(newDiv('111','222','333'), 1,2,'2333');
|
||||
selEnd(newDiv('111','','333'), 0,2,'1333');
|
||||
selEnd(newDiv('111','','333'), 1,0,'333');
|
||||
selEnd(newDiv('111','','333'), 2,0,'333');
|
||||
|
||||
selStart(newDiv('111'), 0,0,'');
|
||||
selStart(newDiv('111'), 0,1,'1');
|
||||
selStart(newDiv('111'), 0,2,'11');
|
||||
selStart(newDiv(''), 0,0,'');
|
||||
selStart(newDiv('111','222'), 0,1,'1');
|
||||
selStart(newDiv('111','222'), 0,2,'11');
|
||||
selStart(newDiv('111','222'), 1,1,'1112');
|
||||
selStart(newDiv('111','222'), 1,2,'11122');
|
||||
selStart(newDiv('111',''), 1,0,'111');
|
||||
selStart(newDiv('111',''), 0,2,'11');
|
||||
selStart(newDiv('111','222','333'), 1,1,'1112');
|
||||
selStart(newDiv('111','222','333'), 1,2,'11122');
|
||||
selStart(newDiv('111','222','333'), 1,2,'11122');
|
||||
selStart(newDiv('111','','333'), 1,0,'111');
|
||||
|
||||
selMiddleStart(newDiv('111','222','333'), 1,1,'2');
|
||||
selMiddleStart(newDiv('111','222','333'), 1,2,'22');
|
||||
selMiddleStart(newDiv('111','222','333'), 2,1,'2223');
|
||||
selMiddleStart(newDiv('111','222','333'), 2,2,'22233');
|
||||
selMiddleStart(newDiv('111','','333'), 2,2,'33');
|
||||
selMiddleStart(newDiv('111','222',''), 2,0,'222');
|
||||
|
||||
selMiddleEnd(newDiv('111','222','333'), 0,1,'11222');
|
||||
selMiddleEnd(newDiv('111','222','333'), 0,2,'1222');
|
||||
selMiddleEnd(newDiv('111','222','333'), 1,1,'22');
|
||||
selMiddleEnd(newDiv('111','222','333'), 1,2,'2');
|
||||
selMiddleEnd(newDiv('111','','333'), 1,0,'');
|
||||
selMiddleEnd(newDiv('','222','333'), 0,0,'222');
|
||||
|
||||
mergeBefore(newDiv('111','222'), 1,1,'2');
|
||||
mergeBefore(newDiv('111','222','333'), 1,2,'22');
|
||||
mergeBefore(newDiv('111','222','333'), 2,1,'2223');
|
||||
mergeBefore(newDiv('111','222','333'), 2,2,'22233');
|
||||
mergeBefore(newDiv('111','','333'), 2,0,'');
|
||||
mergeBefore(newDiv('111','','333'), 2,2,'33');
|
||||
}
|
||||
|
||||
function boom()
|
||||
{
|
||||
runTests("dry run"); // this is to verify the result strings without normalize()
|
||||
dry = false;
|
||||
flush = false;
|
||||
runTests("no flush");
|
||||
flush = true;
|
||||
runTests("flush");
|
||||
}
|
||||
|
||||
boom();
|
||||
|
||||
|
||||
</script>
|
||||
</pre>
|
||||
</body>
|
||||
</html>
|
||||
Загрузка…
Ссылка в новой задаче