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

Backed out changeset 1b67ef7bd374 (bug 1822170) for assertion failures on Accessible.cpp. CLOSED TREE

Browse Source
This commit is contained in:
Marian-Vasile Laza 2023-03-15 20:46:00 +02:00
parent 5a9d677542
commit 5df0512bdd
4 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accessible/mac/CachedTextMarker.mm
View File

@ -327,10 +327,6 @@ NSAttributedString* CachedTextMarkerRange::AttributedText() const {
TextLeafPoint attributesNext;
do {
attributesNext = start.FindTextAttrsStart(eDirNext, false);
if (attributesNext == start) {
MOZ_ASSERT_UNREACHABLE("Cannot proceed further in attribute run");
break;
}
RefPtr<AccAttributes> attributes = start.GetTextAttributes();
MOZ_ASSERT(attributes);
if (attributes && !attributes->Equal(currentRun)) {

8
accessible/mac/mozTextAccessible.mm
View File

@ -415,13 +415,9 @@ static GeckoTextMarkerRange TextMarkerSubrange(Accessible* aAccessible,
NSRange r = [aRange rangeValue];
start.Offset() += r.location;
end.Offset() = start.Offset() + r.length;
end.Offset() = start.Offset() + r.location + r.length;
textMarkerRange = GeckoTextMarkerRange(start, end);
// Crop range to accessible
textMarkerRange.Crop(aAccessible);
return textMarkerRange;
return GeckoTextMarkerRange(start, end);
}
- (NSString*)moxStringForRange:(NSValue*)range {

18
accessible/tests/browser/mac/browser_attributed_text.js
View File

@ -61,24 +61,6 @@ addAccessibleTask(
[" ", "#000000", "#ffffff", null, null, null, 16, null, null],
["test", "#0000ee", "#ffffff", 1, "#0000ee", null, 16, "a2", null],
]);
// Test different NSRange parameters for AXAttributedStringForRange
let worldLeaf = findAccessibleChildByID(accDoc, "a1").firstChild;
let wordStaticText = worldLeaf.nativeInterface.QueryInterface(
Ci.nsIAccessibleMacInterface
);
attributedText = wordStaticText.getParameterizedAttributeValue(
"AXAttributedStringForRange",
NSRange(4, 1)
);
is(attributedText.length, 1, "Last character is in single attribute run");
is(attributedText[0].string, "d", "Last character matches");
attributedText = wordStaticText.getParameterizedAttributeValue(
"AXAttributedStringForRange",
NSRange(5, 1)
);
is(attributedText.length, 0, "Range is past accessible bounds");
}
);

2
accessible/tests/browser/mac/browser_text_leaf.js
View File

@ -65,7 +65,7 @@ addAccessibleTask(
NSRange(3, 6)
);
is(str, "lo, th", "AXStringForRange matches.");
is(str, "lo, this ", "AXStringForRange matches.");
let smallBounds = textLeaf.getParameterizedAttributeValue(
"AXBoundsForRange",