wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 720130 - Tab key shouldn't focus plugins unless tabindex is set. r=smaug

Browse Source
This commit is contained in:
Mounir Lamouri 2012-02-07 13:52:45 +01:00
parent b7c308c36a
commit 71d98e28e8
3 changed files with 95 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
content/html/content/src/nsHTMLObjectElement.cpp
View File

@ -328,8 +328,8 @@ nsHTMLObjectElement::IsFocusableForTabIndex()
return false;
}
return Type() == eType_Plugin || IsEditableRoot() ||
(Type() == eType_Document && nsContentUtils::IsSubDocumentTabbable(this));
return IsEditableRoot() || (Type() == eType_Document &&
nsContentUtils::IsSubDocumentTabbable(this));
}
bool
@ -341,7 +341,7 @@ nsHTMLObjectElement::IsHTMLFocusable(bool aWithMouse,
nsIDocument *doc = GetCurrentDoc();
if (!doc || doc->HasFlag(NODE_IS_EDITABLE)) {
if (aTabIndex) {
GetIntAttr(nsGkAtoms::tabindex, -1, aTabIndex);
GetTabIndex(aTabIndex);
}
*aIsFocusable = false;
@ -356,7 +356,7 @@ nsHTMLObjectElement::IsHTMLFocusable(bool aWithMouse,
// Has plugin content: let the plugin decide what to do in terms of
// internal focus from mouse clicks
if (aTabIndex) {
GetIntAttr(nsGkAtoms::tabindex, 0, aTabIndex);
GetTabIndex(aTabIndex);
}
*aIsFocusable = true;

1
content/html/content/test/Makefile.in
View File

@ -296,6 +296,7 @@ _TEST_FILES = \
test_ol_attributes_reflection.html \
test_bug651956.html \
test_bug694503.html \
test_object_plugin_nav.html \
$(NULL)
_BROWSER_TEST_FILES = \

90
content/html/content/test/test_object_plugin_nav.html Normal file
View File

@ -0,0 +1,90 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=720130
-->
<head>
<meta charset="utf-8">
<title>Test for Bug 720130</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=720130">Mozilla Bug 720130</a>
<p id="display"></p>
<div id="content">
<input>
<object type="application/x-test"></object>
<button>foo</button>
<object tabindex='0' type="application/x-test"></object>
</div>
<pre id="test">
<script type="application/javascript">
/** Test for Bug 720130 **/
var gFocusCount = 0;
var gFocusNb = 4;
/**
* Check the focus navigation.
*/
function checkFocus() {
switch (gFocusCount) {
case 0:
is(document.activeElement, document.getElementsByTagName('a')[0],
"first focused element should be the link");
break;
case 1:
is(document.activeElement, document.getElementsByTagName('input')[0],
"second focused element should be the text field");
break;
case 2:
is(document.activeElement, document.getElementsByTagName('button')[0],
"third focused element should be the button");
break;
case 3:
is(document.activeElement, document.getElementsByTagName('object')[1],
"fourth focused element should be the object");
break;
}
gFocusCount++;
}
SimpleTest.waitForExplicitFinish();
SimpleTest.waitForFocus(function() {
is(document.activeElement, document.body);
// Preliminary check: tabindex should be -1 on the object.
is(document.getElementsByTagName('object')[0].tabIndex, -1,
"the plugin shouldn't get focus while navigating in the document");
document.addEventListener("focus", function() {
checkFocus();
if (gFocusCount != gFocusNb) {
synthesizeKey("VK_TAB", {});
return;
}
document.removeEventListener("focus", arguments.callee, true);
// Just make sure that .focus() still works.
var o = document.getElementsByTagName('object')[0];
o.onfocus = function() {
SimpleTest.finish();
o.onfocus = null;
};
o.focus();
}, true);
synthesizeKey("VK_TAB", {});
});
</script>
</pre>
</body>
</html>