Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1669359 - Fix GeckoTextMarker lesser-than operator. r=morgan

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D92511
This commit is contained in:
Eitan Isaacson 2020-10-06 17:24:19 +00:00
parent 3d963ac35e
commit 68fd6a3f35
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
accessible/mac/GeckoTextMarker.mm
View File

@ -133,6 +133,33 @@ bool GeckoTextMarker::operator<(const GeckoTextMarker& aPoint) const {
}
}
if (pos1 != 0) {
// If parents1 is a superset of parents2 then mContainer is a
// descendant of aPoint.mContainer. The next element down in parents1
// is mContainer's ancestor that is the child of aPoint.mContainer.
// We compare its end offset in aPoint.mContainer with aPoint.mOffset.
AccessibleOrProxy child = parents1.ElementAt(pos1 - 1);
MOZ_ASSERT(child.Parent() == aPoint.mContainer);
bool unused;
uint32_t endOffset = child.IsProxy() ? child.AsProxy()->EndOffset(&unused)
: child.AsAccessible()->EndOffset();
return endOffset < static_cast<uint32_t>(aPoint.mOffset);
}
if (pos2 != 0) {
// If parents2 is a superset of parents1 then aPoint.mContainer is a
// descendant of mContainer. The next element down in parents2
// is aPoint.mContainer's ancestor that is the child of mContainer.
// We compare its start offset in mContainer with mOffset.
AccessibleOrProxy child = parents2.ElementAt(pos2 - 1);
MOZ_ASSERT(child.Parent() == mContainer);
bool unused;
uint32_t startOffset = child.IsProxy()
? child.AsProxy()->StartOffset(&unused)
: child.AsAccessible()->StartOffset();
return static_cast<uint32_t>(mOffset) < startOffset;
}
MOZ_ASSERT_UNREACHABLE("Broken tree?!");
return false;
}

22
accessible/tests/browser/mac/browser_text_basics.js
View File

@ -216,3 +216,25 @@ addAccessibleTask("mac/doc_textmarker_test.html", async (browser, accDoc) => {
testMarkerIntegrity(accDoc, expectedMarkerValues);
});
// Test text marker lesser-than operator
addAccessibleTask(
`<p id="p">hello <a id="a" href="#">goodbye</a> world</p>`,
async (browser, accDoc) => {
let macDoc = accDoc.nativeInterface.QueryInterface(
Ci.nsIAccessibleMacInterface
);
let start = macDoc.getParameterizedAttributeValue(
"AXTextMarkerForIndex",
1
);
let end = macDoc.getParameterizedAttributeValue("AXTextMarkerForIndex", 10);
let range = macDoc.getParameterizedAttributeValue(
"AXTextMarkerRangeForUnorderedTextMarkers",
[end, start]
);
is(stringForRange(macDoc, range), "ello good");
}
);