mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1775329: Support cached OffsetAtPoint in HyperTextAccessibleBase r=Jamie 

Differential Revision: https://phabricator.services.mozilla.com/D150049
This commit is contained in:
Morgan Rae Reschenberg 2022-06-29 19:00:14 +00:00
Родитель 3fd29fdf82
Коммит a68d0f55b4
14 изменённых файлов: 98 добавлений и 228 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

12
accessible/base/TextLeafRange.cpp
Просмотреть файл

@ -1403,7 +1403,7 @@ TextLeafPoint TextLeafPoint::FindTextAttrsStart(nsDirection aDirection,
LayoutDeviceIntRect TextLeafPoint::CharBounds() {
if (mAcc && !mAcc->IsText()) {
// If we're dealing with an empty embedded object, return the
// If we're dealing with an empty container, return the
// accessible's non-text bounds.
return mAcc->Bounds();
}
@ -1426,4 +1426,14 @@ LayoutDeviceIntRect TextLeafPoint::CharBounds() {
return LayoutDeviceIntRect();
}
bool TextLeafPoint::ContainsPoint(int32_t aX, int32_t aY) {
if (mAcc && !mAcc->IsText()) {
// If we're dealing with an empty embedded object, use the
// accessible's non-text bounds.
return mAcc->Bounds().Contains(aX, aY);
}
return CharBounds().Contains(aX, aY);
}
} // namespace mozilla::a11y

9
accessible/base/TextLeafRange.h
Просмотреть файл

@ -168,6 +168,15 @@ class TextLeafPoint final {
*/
LayoutDeviceIntRect CharBounds();
/**
* Returns true if the given point (in screen coords) is contained
* in the char bounds of the current TextLeafPoint. Returns false otherwise.
* If the current point is an empty container, we use the acc's bounds instead
* of char bounds. Because this depends on CharBounds, this function only
* works on remote accessibles, and assumes caching is enabled.
*/
bool ContainsPoint(int32_t aX, int32_t aY);
bool IsLineFeedChar() const { return GetChar() == '\n'; }
bool IsSpace() const;

27
accessible/basetypes/HyperTextAccessibleBase.cpp
Просмотреть файл

@ -247,6 +247,33 @@ LayoutDeviceIntRect HyperTextAccessibleBase::TextBounds(int32_t aStartOffset,
return result;
}
int32_t HyperTextAccessibleBase::OffsetAtPoint(int32_t aX, int32_t aY,
uint32_t aCoordType) {
Accessible* thisAcc = Acc();
LayoutDeviceIntPoint coords =
nsAccUtils::ConvertToScreenCoords(aX, aY, aCoordType, thisAcc);
if (!thisAcc->Bounds().Contains(coords.x, coords.y)) {
// The requested point does not exist in this accessible.
return -1;
}
TextLeafPoint point = ToTextLeafPoint(0, false);
// As with TextBounds, we walk to the very end of the text contained in this
// hypertext and then step backwards to make our endPoint inclusive.
TextLeafPoint endPoint =
ToTextLeafPoint(static_cast<int32_t>(CharacterCount()), true);
endPoint =
endPoint.FindBoundary(nsIAccessibleText::BOUNDARY_CHAR, eDirPrevious,
/* aIncludeOrigin */ false);
// XXX: We should create a TextLeafRange object for this hypertext and move
// this search inside the TextLeafRange class.
for (; !point.ContainsPoint(coords.x, coords.y) && point != endPoint;
point = point.FindBoundary(nsIAccessibleText::BOUNDARY_CHAR, eDirNext,
/* aIncludeOrigin */ false)) {
};
return point.ContainsPoint(coords.x, coords.y) ? point.mOffset : -1;
}
TextLeafPoint HyperTextAccessibleBase::ToTextLeafPoint(int32_t aOffset,
bool aDescendToEnd) {
Accessible* thisAcc = Acc();

5
accessible/basetypes/HyperTextAccessibleBase.h
Просмотреть файл

@ -115,6 +115,11 @@ class HyperTextAccessibleBase {
int32_t aEndOffset,
uint32_t aCoordType);
/**
* Return the offset of the char that contains the given coordinates.
*/
virtual int32_t OffsetAtPoint(int32_t aX, int32_t aY, uint32_t aCoordType);
/**
* Get a TextLeafPoint for a given offset in this HyperTextAccessible.
* If the offset points to an embedded object and aDescendToEnd is true,

2
accessible/generic/HyperTextAccessible.h
Просмотреть файл

@ -171,7 +171,7 @@ class HyperTextAccessible : public AccessibleWrap,
/**
* Return an offset at the given point.
*/
int32_t OffsetAtPoint(int32_t aX, int32_t aY, uint32_t aCoordType);
int32_t OffsetAtPoint(int32_t aX, int32_t aY, uint32_t aCoordType) override;
LayoutDeviceIntRect TextBounds(
int32_t aStartOffset, int32_t aEndOffset,

3
accessible/ipc/RemoteAccessibleShared.h
Просмотреть файл

@ -90,7 +90,8 @@ virtual void TextBeforeOffset(int32_t aOffset,
char16_t CharAt(int32_t aOffset);
int32_t OffsetAtPoint(int32_t aX, int32_t aY, uint32_t aCoordType);
virtual int32_t OffsetAtPoint(int32_t aX, int32_t aY,
uint32_t aCoordType) override;
bool SetSelectionBoundsAt(int32_t aSelectionNum, int32_t aStartOffset,
int32_t aEndOffset);

6
accessible/ipc/other/RemoteAccessible.cpp
Просмотреть файл

@ -309,6 +309,12 @@ LayoutDeviceIntRect RemoteAccessible::CharBounds(int32_t aOffset,
int32_t RemoteAccessible::OffsetAtPoint(int32_t aX, int32_t aY,
uint32_t aCoordType) {
if (StaticPrefs::accessibility_cache_enabled_AtStartup()) {
MOZ_ASSERT(IsHyperText(), "is not hypertext?");
return RemoteAccessibleBase<RemoteAccessible>::OffsetAtPoint(aX, aY,
aCoordType);
}
int32_t retVal = -1;
Unused << mDoc->SendOffsetAtPoint(mID, aX, aY, aCoordType, &retVal);
return retVal;

5
accessible/ipc/win/RemoteAccessible.cpp
Просмотреть файл

@ -517,6 +517,11 @@ static IA2TextBoundaryType GetIA2TextBoundary(
int32_t RemoteAccessible::OffsetAtPoint(int32_t aX, int32_t aY,
uint32_t aCoordinateType) {
if (StaticPrefs::accessibility_cache_enabled_AtStartup()) {
return RemoteAccessibleBase<RemoteAccessible>::OffsetAtPoint(
aX, aY, aCoordinateType);
}
RefPtr<IAccessibleText> acc = QueryInterface<IAccessibleText>(this);
if (!acc) {
return -1;

1
accessible/tests/browser/e10s/browser.ini
Просмотреть файл

@ -72,4 +72,3 @@ skip-if = true # Failing due to incorrect index of test container children on do
[browser_obj_group.js]
skip-if = os == 'win' # Only supported with cache enabled
[browser_caching_position.js]
[browser_caching_hittest.js]

187
accessible/tests/browser/e10s/browser_caching_hittest.js
Просмотреть файл

@ -1,187 +0,0 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
"use strict";
const { Layout } = ChromeUtils.import(
"chrome://mochitests/content/browser/accessible/tests/browser/Layout.jsm"
);
const { CommonUtils } = ChromeUtils.import(
"chrome://mochitests/content/browser/accessible/tests/browser/Common.jsm"
);
function getChildAtPoint(container, x, y, findDeepestChild) {
try {
const child = findDeepestChild
? container.getDeepestChildAtPoint(x, y)
: container.getChildAtPoint(x, y);
info(`Got child with role: ${roleToString(child.role)}`);
return child;
} catch (e) {
// Failed to get child at point.
}
return null;
}
async function testChildAtPoint(dpr, x, y, container, child, grandChild) {
const [containerX, containerY] = Layout.getBounds(container, dpr);
x += containerX;
y += containerY;
await untilCacheIs(
() => getChildAtPoint(container, x, y, false),
child,
`Wrong direct child accessible at the point (${x}, ${y}) of ${CommonUtils.prettyName(
container
)}, sought ${child ? roleToString(child.role) : "unknown"}`
);
await untilCacheIs(
() => getChildAtPoint(container, x, y, true),
grandChild,
`Wrong deepest child accessible at the point (${x}, ${y}) of ${CommonUtils.prettyName(
container
)}, sought ${grandChild ? roleToString(grandChild.role) : "unknown"}`
);
}
async function hitTest(browser, container, child, grandChild) {
const [childX, childY] = await getContentBoundsForDOMElm(
browser,
getAccessibleDOMNodeID(child)
);
const x = childX + 1;
const y = childY + 1;
await untilCacheIs(
() => getChildAtPoint(container, x, y, false),
child,
`Wrong direct child accessible at the point (${x}, ${y}) of ${CommonUtils.prettyName(
container
)}, sought ${child ? roleToString(child.role) : "unknown"}`
);
await untilCacheIs(
() => getChildAtPoint(container, x, y, true),
grandChild,
`Wrong deepest child accessible at the point (${x}, ${y}) of ${CommonUtils.prettyName(
container
)}, sought ${grandChild ? roleToString(grandChild.role) : "unknown"}`
);
}
async function runTests(browser, accDoc) {
await waitForImageMap(browser, accDoc);
const dpr = await getContentDPR(browser);
await testChildAtPoint(
dpr,
3,
3,
findAccessibleChildByID(accDoc, "list"),
findAccessibleChildByID(accDoc, "listitem"),
findAccessibleChildByID(accDoc, "inner").firstChild
);
todo(
false,
"Bug 746974 - children must match on all platforms. On Windows, " +
"ChildAtPoint with eDeepestChild is incorrectly ignoring MustPrune " +
"for the graphic."
);
const txt = findAccessibleChildByID(accDoc, "txt");
await testChildAtPoint(dpr, 1, 1, txt, txt, txt);
info(
"::MustPrune case, point is outside of textbox accessible but is in document."
);
await testChildAtPoint(dpr, -1, -1, txt, null, null);
info("::MustPrune case, point is outside of root accessible.");
await testChildAtPoint(dpr, -10000, -10000, txt, null, null);
info("Not specific case, point is inside of btn accessible.");
const btn = findAccessibleChildByID(accDoc, "btn");
await testChildAtPoint(dpr, 1, 1, btn, btn, btn);
info("Not specific case, point is outside of btn accessible.");
await testChildAtPoint(dpr, -1, -1, btn, null, null);
info(
"Out of flow accessible testing, do not return out of flow accessible " +
"because it's not a child of the accessible even though visually it is."
);
await invokeContentTask(browser, [], () => {
// We have to reimprot CommonUtils in this scope -- eslint thinks this is
// wrong, but if you remove it, things will break.
/* eslint-disable no-shadow */
const { CommonUtils } = ChromeUtils.import(
"chrome://mochitests/content/browser/accessible/tests/browser/Common.jsm"
);
/* eslint-enable no-shadow */
const doc = content.document;
const rectArea = CommonUtils.getNode("area", doc).getBoundingClientRect();
const outOfFlow = CommonUtils.getNode("outofflow", doc);
outOfFlow.style.left = rectArea.left + "px";
outOfFlow.style.top = rectArea.top + "px";
});
const area = findAccessibleChildByID(accDoc, "area");
await testChildAtPoint(dpr, 1, 1, area, area, area);
info("Test image maps. Their children are not in the layout tree.");
const imgmap = findAccessibleChildByID(accDoc, "imgmap");
const theLetterA = imgmap.firstChild;
await hitTest(browser, imgmap, theLetterA, theLetterA);
await hitTest(
browser,
findAccessibleChildByID(accDoc, "container"),
imgmap,
theLetterA
);
info("hit testing for element contained by zero-width element");
const container2Input = findAccessibleChildByID(accDoc, "container2_input");
await hitTest(
browser,
findAccessibleChildByID(accDoc, "container2"),
container2Input,
container2Input
);
}
addAccessibleTask(
`
<div role="list" id="list">
<div role="listitem" id="listitem"><span title="foo" id="inner">inner</span>item</div>
</div>
<span role="button">button1</span><span role="button" id="btn">button2</span>
<span role="textbox">textbox1</span><span role="textbox" id="txt">textbox2</span>
<div id="outofflow" style="width: 10px; height: 10px; position: absolute; left: 0px; top: 0px; background-color: yellow;">
</div>
<div id="area" style="width: 100px; height: 100px; background-color: blue;"></div>
<map name="atoz_map">
<area id="thelettera" href="http://www.bbc.co.uk/radio4/atoz/index.shtml#a"
coords="0,0,15,15" alt="thelettera" shape="rect"/>
</map>
<div id="container">
<img id="imgmap" width="447" height="15" usemap="#atoz_map" src="http://example.com/a11y/accessible/tests/mochitest/letters.gif"/>
</div>
<div id="container2" style="width: 0px">
<input id="container2_input">
</div>
`,
runTests,
{
iframe: true,
remoteIframe: true,
// Ensure that all hittest elements are in view.
iframeAttrs: { style: "width: 600px; height: 600px; padding: 10px;" },
}
);

22
accessible/tests/browser/hittest/browser_test_general.js
Просмотреть файл

@ -8,8 +8,7 @@ async function runTests(browser, accDoc) {
await waitForImageMap(browser, accDoc);
const dpr = await getContentDPR(browser);
info("Not specific case, child and deepchild testing.");
testChildAtPoint(
await testChildAtPoint(
dpr,
3,
3,
@ -24,27 +23,23 @@ async function runTests(browser, accDoc) {
"for the graphic."
);
info(
"::MustPrune case (in this case childAtPoint doesn't look inside a " +
"textbox), point is inside of textbox."
);
const txt = findAccessibleChildByID(accDoc, "txt");
testChildAtPoint(dpr, 1, 1, txt, txt, txt);
await testChildAtPoint(dpr, 1, 1, txt, txt, txt);
info(
"::MustPrune case, point is outside of textbox accessible but is in document."
);
testChildAtPoint(dpr, -1, -1, txt, null, null);
await testChildAtPoint(dpr, -1, -1, txt, null, null);
info("::MustPrune case, point is outside of root accessible.");
testChildAtPoint(dpr, -10000, -10000, txt, null, null);
await testChildAtPoint(dpr, -10000, -10000, txt, null, null);
info("Not specific case, point is inside of btn accessible.");
const btn = findAccessibleChildByID(accDoc, "btn");
testChildAtPoint(dpr, 1, 1, btn, btn, btn);
await testChildAtPoint(dpr, 1, 1, btn, btn, btn);
info("Not specific case, point is outside of btn accessible.");
testChildAtPoint(dpr, -1, -1, btn, null, null);
await testChildAtPoint(dpr, -1, -1, btn, null, null);
info(
"Out of flow accessible testing, do not return out of flow accessible " +
@ -54,7 +49,6 @@ async function runTests(browser, accDoc) {
const { CommonUtils } = ChromeUtils.import(
"chrome://mochitests/content/browser/accessible/tests/browser/Common.jsm"
);
const doc = content.document;
const rectArea = CommonUtils.getNode("area", doc).getBoundingClientRect();
const outOfFlow = CommonUtils.getNode("outofflow", doc);
@ -63,7 +57,7 @@ async function runTests(browser, accDoc) {
});
const area = findAccessibleChildByID(accDoc, "area");
testChildAtPoint(dpr, 1, 1, area, area, area);
await testChildAtPoint(dpr, 1, 1, area, area, area);
info("Test image maps. Their children are not in the layout tree.");
const imgmap = findAccessibleChildByID(accDoc, "imgmap");
@ -118,6 +112,6 @@ addAccessibleTask(
iframe: true,
remoteIframe: true,
// Ensure that all hittest elements are in view.
iframeAttrs: { style: "width: 600px; height: 600px;" },
iframeAttrs: { style: "width: 600px; height: 600px; padding: 10px;" },
}
);

4
accessible/tests/browser/hittest/browser_test_shadowroot.js
Просмотреть файл

@ -7,7 +7,7 @@
async function runTests(browser, accDoc) {
const dpr = await getContentDPR(browser);
let componentAcc = findAccessibleChildByID(accDoc, "component1");
testChildAtPoint(
await testChildAtPoint(
dpr,
1,
1,
@ -17,7 +17,7 @@ async function runTests(browser, accDoc) {
);
componentAcc = findAccessibleChildByID(accDoc, "component2");
testChildAtPoint(
await testChildAtPoint(
dpr,
1,
1,

10
accessible/tests/browser/hittest/browser_test_zoom_text.js
Просмотреть файл

@ -7,9 +7,9 @@
/**
* Test if getOffsetAtPoint returns the given text offset at given coordinates.
*/
function testOffsetAtPoint(hyperText, x, y, coordType, expectedOffset) {
is(
hyperText.getOffsetAtPoint(x, y, coordType),
async function testOffsetAtPoint(hyperText, x, y, coordType, expectedOffset) {
await untilCacheIs(
() => hyperText.getOffsetAtPoint(x, y, coordType),
expectedOffset,
`Wrong offset at given point (${x}, ${y}) for ${prettyName(hyperText)}`
);
@ -33,7 +33,7 @@ async function runTests(browser, accDoc) {
await getContentDPR(browser)
);
testOffsetAtPoint(
await testOffsetAtPoint(
hyperText,
x + width / 2,
y + height / 2,
@ -55,7 +55,7 @@ async function runTests(browser, accDoc) {
await getContentDPR(browser)
);
testOffsetAtPoint(
await testOffsetAtPoint(
hyperText,
x + width / 2,
y + height / 2,

33
accessible/tests/browser/hittest/head.js
Просмотреть файл

@ -41,25 +41,23 @@ function getChildAtPoint(container, x, y, findDeepestChild) {
return null;
}
function testChildAtPoint(dpr, x, y, container, child, grandChild) {
async function testChildAtPoint(dpr, x, y, container, child, grandChild) {
const [containerX, containerY] = Layout.getBounds(container, dpr);
x += containerX;
y += containerY;
CommonUtils.isObject(
getChildAtPoint(container, x, y, false),
await untilCacheIs(
() => getChildAtPoint(container, x, y, false),
child,
`Wrong direct child accessible at the point (${x}, ${y}) of ${CommonUtils.prettyName(
container
)}`
)}, sought ${child ? roleToString(child.role) : "unknown"}`
);
CommonUtils.isObject(
getChildAtPoint(container, x, y, true),
await untilCacheIs(
() => getChildAtPoint(container, x, y, true),
grandChild,
`Wrong deepest child accessible at the point (${x}, ${y}) of ${CommonUtils.prettyName(
container
)}`
)}, sought ${grandChild ? roleToString(grandChild.role) : "unknown"}`
);
}
@ -75,15 +73,18 @@ async function hitTest(browser, container, child, grandChild) {
const x = childX + 1;
const y = childY + 1;
CommonUtils.isObject(
getChildAtPoint(container, x, y, false),
await untilCacheIs(
() => getChildAtPoint(container, x, y, false),
child,
`Wrong direct child of ${prettyName(container)}`
`Wrong direct child accessible at the point (${x}, ${y}) of ${CommonUtils.prettyName(
container
)}, sought ${child ? roleToString(child.role) : "unknown"}`
);
CommonUtils.isObject(
getChildAtPoint(container, x, y, true),
await untilCacheIs(
() => getChildAtPoint(container, x, y, true),
grandChild,
`Wrong deepest child of ${prettyName(container)}`
`Wrong deepest child accessible at the point (${x}, ${y}) of ${CommonUtils.prettyName(
container
)}, sought ${grandChild ? roleToString(grandChild.role) : "unknown"}`
);
}