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

Bug 1756528: Fix cropping of siblings in TextRange::Crop. r=eeejay

Browse Source 
There was already a code path to handle siblings, but this only applied if the boundary child at the range's start/end (often a text leaf) was a sibling of aContainer.
It didn't apply if aContainer was a direct sibling of the range's start/end container.
To fix this, don't restrict the code which handles the case where aContainer does not contain the start/end boundary.
This should always fail to crop, regardless of the ancestry.

Differential Revision: https://phabricator.services.mozilla.com/D139351
This commit is contained in:
James Teh 2022-02-26 23:01:56 +00:00
parent 8c2cca9320
commit 2f2e5d80a2
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accessible/base/TextRange.cpp
View File

@ -203,7 +203,7 @@ bool TextRange::Crop(Accessible* aContainer) {
// The start boundary and the container are siblings.
container = aContainer;
}
} else if (containerPos != 0) {
} else {
// The container does not contain the start boundary.
boundary = boundaryParents[boundaryPos];
container = containerParents[containerPos];
@ -243,7 +243,7 @@ bool TextRange::Crop(Accessible* aContainer) {
} else {
container = aContainer;
}
} else if (containerPos != 0) {
} else {
boundary = boundaryParents[boundaryPos];
container = containerParents[containerPos];
}

21
accessible/tests/browser/e10s/browser_caching_text.js
View File

@ -819,8 +819,16 @@ addAccessibleTask(
testSelectionRange(browser, editable, p1, 0, p1, 1);
testTextGetSelection(editable, 0, 1, 0);
testTextGetSelection(p1, 0, 1, 0);
const p2 = findAccessibleChildByID(docAcc, "p2", [nsIAccessibleText]);
if (isCacheEnabled && browser.isRemoteBrowser) {
is(p2.selectionCount, 0, "p2 selectionCount is 0");
} else {
todo(
false,
"Siblings report wrong selection in non-cache implementation"
);
}
// Selecting across two Accessibles with only a partial selection in the
// second.
info("Selecting ab in editable");
@ -899,6 +907,17 @@ addAccessibleTask(
is(editable.selectionCount, 2, "editable selectionCount is 2");
testTextGetSelection(editable, 0, 1, 0);
testTextGetSelection(editable, 1, 2, 1);
if (isCacheEnabled && browser.isRemoteBrowser) {
is(p1.selectionCount, 1, "p1 selectionCount is 1");
testTextGetSelection(p1, 0, 1, 0);
is(p2.selectionCount, 1, "p2 selectionCount is 1");
testTextGetSelection(p2, 0, 1, 0);
} else {
todo(
false,
"Siblings report wrong selection in non-cache implementation"
);
}
},
{
chrome: true,

15
accessible/tests/mochitest/textrange/test_selection.html
View File

@ -105,6 +105,19 @@
res = a11yrange.compareEndPoints(EndPoint_End, a11yrange, EndPoint_Start);
is(res, 1, "end must be greater than start");
// Crop a range to its next sibling.
range.selectNode(getNode("c3p1").firstChild);
a11yranges = getAccessible(document, [nsIAccessibleText]).selectionRanges;
a11yrange = a11yranges.queryElementAt(0, nsIAccessibleTextRange);
testTextRange(a11yrange, "selection range #8", "c3p1", 0, "c3p1", 1);
ok(!a11yrange.crop(getAccessible("c3p2")), "Crop #8 succeeded but shouldn't have.");
// Crop a range to its previous sibling.
range.selectNode(getNode("c3p2").firstChild);
a11yranges = getAccessible(document, [nsIAccessibleText]).selectionRanges;
a11yrange = a11yranges.queryElementAt(0, nsIAccessibleTextRange);
testTextRange(a11yrange, "selection range #9", "c3p2", 0, "c3p2", 1);
ok(!a11yrange.crop(getAccessible("c3p1")), "Crop #9 succeeded but shouldn't have.");
SimpleTest.finish();
}
@ -125,5 +138,7 @@
<p id="p1">text <a id="p2_a" href="www">link<img id="p2_img", src="../moz.png"></a> text</p>
<div id="c2">start<table id="table"><tr><td>cell</td></tr></table>end</div>
<div id="c3"><p id="c3p1">a</p><p id="c3p2">b</p></div>
</body>
</html>