Bug 676267 - expose stale state on accessibles unattached from tree, r=tbsaunde

This commit is contained in:
Alexander Surkov 2011-08-04 18:54:06 +09:00
parent 527591fbb1
commit e1ab9b72b7
4 changed files with 133 additions and 2 deletions

View File

@ -663,6 +663,11 @@ PRUint64
nsAccessible::NativeState()
{
PRUint64 state = 0;
nsDocAccessible* document = GetDocAccessible();
if (!document || !document->IsInDocument(this))
state |= states::STALE;
PRBool disabled = PR_FALSE;
if (mContent->IsElement()) {
nsEventStates elementState = mContent->AsElement()->State();

View File

@ -235,9 +235,19 @@ public:
/**
* Return whether the given DOM node has an accessible or not.
*/
inline bool HasAccessible(nsINode* aNode)
inline bool HasAccessible(nsINode* aNode) const
{ return GetAccessible(aNode); }
/**
* Return true if the given accessible is in document.
*/
inline bool IsInDocument(nsAccessible* aAccessible) const
{
return GetAccessible(aNode);
nsAccessible* acc = aAccessible;
while (acc && !acc->IsPrimaryForNode())
acc = acc->Parent();
return acc ? mNodeToAccessibleMap.Get(acc->GetNode()) : false;
}
/**

View File

@ -58,6 +58,7 @@ _TEST_FILES =\
test_inputs.xul \
test_link.html \
test_popup.xul \
test_stale.html \
test_textbox.xul \
test_tree.xul \
z_frames.html \

View File

@ -0,0 +1,115 @@
<!DOCTYPE html>
<html>
<head>
<title>Stale state testing</title>
<link rel="stylesheet" type="text/css"
href="chrome://mochikit/content/tests/SimpleTest/test.css" />
<script type="application/javascript"
src="chrome://mochikit/content/MochiKit/packed.js"></script>
<script type="application/javascript"
src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript"
src="../common.js"></script>
<script type="application/javascript"
src="../states.js"></script>
<script type="application/javascript"
src="../events.js"></script>
<script type="application/javascript">
function addChild(aContainerID)
{
this.containerNode = getNode(aContainerID);
this.childNode = null;
this.eventSeq = [
new invokerChecker(EVENT_REORDER, this.containerNode)
];
this.invoke = function addChild_invoke()
{
this.childNode = document.createElement("div");
this.containerNode.appendChild(this.childNode);
}
this.finalCheck = function addChild_finalCheck()
{
// no stale state should be set
testStates(this.childNode, 0, 0, 0, EXT_STATE_STALE);
}
this.getID = function addChild_getID()
{
return "add child for " + prettyName(aContainerID);
}
}
function removeChildChecker(aInvoker)
{
this.type = EVENT_HIDE;
this.__defineGetter__("target", function() { return aInvoker.child; });
this.check = function removeChildChecker_check()
{
// stale state should be set
testStates(aInvoker.child, 0, EXT_STATE_STALE);
}
}
function removeChild(aContainerID)
{
this.containerNode = getNode(aContainerID);
this.child = null;
this.eventSeq = [
new removeChildChecker(this)
];
this.invoke = function removeChild_invoke()
{
var childNode = this.containerNode.firstChild;
this.child = getAccessible(childNode);
this.containerNode.removeChild(childNode);
}
this.getID = function removeChild_getID()
{
return "remove child from " + prettyName(aContainerID);
}
}
//gA11yEventDumpToConsole = true; //debugging
var gQueue = null;
function doTest()
{
gQueue = new eventQueue();
gQueue.push(new addChild("container"));
gQueue.push(new removeChild("container"));
gQueue.invoke(); // will call SimpleTest.finish()
}
SimpleTest.waitForExplicitFinish();
addA11yLoadEvent(doTest);
</script>
</head>
<body role="">
<a target="_blank"
title="Expose stale state on accessibles unattached from tree"
href="https://bugzilla.mozilla.org/show_bug.cgi?id=676267">Mozilla Bug 676267</a>
<p id="display"></p>
<div id="content" style="display: none"></div>
<pre id="test">
</pre>
<div id="container"></div>
</body>
</html>