bug 397644. Don't process xhtml2:role, r=mano, r=philringnalda, r=surkov, sr=neil, a=dsicore
--- a/accessible/src/base/nsAccessNode.cpp
+++ b/accessible/src/base/nsAccessNode.cpp
@@ -851,19 +851,17 @@ nsAccessNode::GetARIARole(nsIContent *aC
nsAutoString mimeType;
doc->GetContentType(mimeType);
if (mimeType.EqualsLiteral("text/html")) {
allowPrefixLookup = PR_FALSE;
}
}
}
// In non-HTML content, use XHTML namespaced-role attribute
- // XXX We still support XHTML2 for now because of XUL content, but will migrate to XHTML after FF3
- else if (!aContent->GetAttr(kNameSpaceID_XHTML, nsAccessibilityAtoms::role, aRole) &&
- !aContent->GetAttr(kNameSpaceID_XHTML2_Unofficial, nsAccessibilityAtoms::role, aRole)) {
+ else if (!aContent->GetAttr(kNameSpaceID_XHTML, nsAccessibilityAtoms::role, aRole)) {
return PR_FALSE;
}
PRBool hasPrefix = (aRole.Find(":") >= 0);
if (!hasPrefix) {
// * No prefix* -- not a QName
// Just return entire string as long as prefix is not currently required
--- a/browser/components/migration/content/migration.xul
+++ b/browser/components/migration/content/migration.xul
@@ -43,18 +43,17 @@
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
windowtype="Browser:MigrationWizard"
title="&migrationWizard.title;"
onload="MigrationWizard.init()"
onunload="MigrationWizard.uninit()"
style="width: 40em;"
buttons="accept,cancel"
branded="true"
- xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
- xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#">
+ xmlns:xhtml="http://www.w3.org/1999/xhtml">
<script type="application/x-javascript" src="chrome://browser/content/migration/migration.js"/>
<stringbundle id="bundle" src="chrome://browser/locale/migration/migration.properties"/>
<stringbundle id="brandBundle" src="chrome://branding/locale/brand.properties"/>
<wizardpage id="importSource" pageid="importSource" next="selectProfile"
label="&importSource.title;"
@@ -128,17 +127,17 @@
next="homePageImport"
onpageshow="return MigrationWizard.onImportItemsPageShow();"
onpagerewound="return MigrationWizard.onImportItemsPageRewound();"
onpageadvanced="return MigrationWizard.onImportItemsPageAdvanced();"
oncommand="MigrationWizard.onImportItemCommand();">
<description control="dataSources">&importItems.label;</description>
<vbox id="dataSources" style="overflow: auto; -moz-appearance: listbox" align="left" flex="1"
- xhtml2:role="wairole:groupbox"/>
+ xhtml:role="group"/>
</wizardpage>
<wizardpage id="homePageImport" pageid="homePageImport"
next="migrating"
onpageshow="return MigrationWizard.onHomePageMigrationPageShow();"
onpageadvanced="return MigrationWizard.onHomePageMigrationPageAdvanced();">
<description id="homePageImportDesc" control="homePageRadioGroup"/>
@@ -148,22 +147,20 @@
</radiogroup>
</wizardpage>
<wizardpage id="migrating" pageid="migrating" label="&migrating.title;"
next="done"
onpageshow="MigrationWizard.onMigratingPageShow();">
<description control="migratingItems">&migrating.label;</description>
- <vbox id="migratingItems" style="overflow: auto;" align="left"
- xhtml2:role="wairole:groupbox"/>
+ <vbox id="migratingItems" style="overflow: auto;" align="left" xhtml:role="group"/>
</wizardpage>
<wizardpage id="done" pageid="done" label="&done.title;"
onpageshow="MigrationWizard.onDonePageShow();">
<description control="doneItems">&done.label;</description>
- <vbox id="doneItems" style="overflow: auto;" align="left"
- xhtml2:role="wairole:groupbox"/>
+ <vbox id="doneItems" style="overflow: auto;" align="left" xhtml:role="group"/>
</wizardpage>
</wizard>
--- a/browser/components/preferences/advanced.xul
+++ b/browser/components/preferences/advanced.xul
@@ -48,18 +48,17 @@
%privacyDTD;
]>
<overlay id="AdvancedPaneOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<prefpane id="paneAdvanced" onpaneload="gAdvancedPane.init();"
helpURI="chrome://browser/locale/help/help.rdf"
- xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
- xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
xmlns:aaa="http://www.w3.org/2005/07/aaa">
<preferences id="advancedPreferences">
<preference id="browser.preferences.advanced.selectedTabIndex"
name="browser.preferences.advanced.selectedTabIndex"
type="int"/>
<!--XXX button prefs -->
@@ -218,17 +217,17 @@
oncommand="gAdvancedPane.clearCache();"/>
</hbox>
</groupbox>
</tabpanel>
<!-- Update -->
<tabpanel id="updatePanel" orient="vertical" align="start">
<label control="autoUpdateGroup">&autoCheck.label;</label>
- <vbox class="indent" id="autoUpdateGroup" xhtml2:role="wairole:groupbox">
+ <vbox class="indent" id="autoUpdateGroup" xhtml:role="group">
<checkbox id="enableAppUpdate"
label="&enableAppUpdate.label;"
accesskey="&enableAppUpdate.accesskey;"
preference="app.update.enabled"/>
<checkbox id="enableAddonUpdate"
label="&enableAddonsUpdate.label;"
accesskey="&enableAddonsUpdate.accesskey;"
preference="extensions.update.enabled"/>
--- a/browser/components/safebrowsing/content/warning-overlay.xul
+++ b/browser/components/safebrowsing/content/warning-overlay.xul
@@ -29,19 +29,18 @@
<vbox id="safebrowsing-palm-message" hidden="true" pack="center"
class="safebrowsing-palm-fixed-width">
<!-- This is the main warning area -->
<vbox id="safebrowsing-palm-message-content"
class="safebrowsing-palm-fixed-width"
style="-moz-user-focus: normal"
- xmlns:x2="http://www.w3.org/TR/xhtml2"
- xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
- x2:role="wairole:alert">
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
+ xhtml:role="alert">
<hbox id="safebrowsing-palm-close-container" align="center"
class="safebrowsing-palm-fixed-width">
<spacer flex="1"/>
<image id="safebrowsing-palm-close"
onclick="goDoCommand('safebrowsing-decline-warning')"/>
</hbox>
--- a/toolkit/components/alerts/resources/content/alert.xul
+++ b/toolkit/components/alerts/resources/content/alert.xul
@@ -36,19 +36,18 @@
-
- ***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://global/skin/alerts/alert.css" type="text/css"?>
<window id="alertNotification"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
windowtype="alert:alert"
- xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
- xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
- xhtml2:role="wairole:alert"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
+ xhtml:role="alert"
pack="start"
onload="onAlertLoad()">
<script type="application/javascript" src="chrome://global/content/alerts/alert.js"/>
<box id="alertBox" class="alertBox">
<hbox class="alertImageBox" align="center" pack="center">
--- a/toolkit/content/commonDialog.xul
+++ b/toolkit/content/commonDialog.xul
@@ -1,19 +1,18 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<!DOCTYPE dialog SYSTEM "chrome://global/locale/commonDialog.dtd">
<dialog id="commonDialog"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
- xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
- xhtml2:role="wairole:alert"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
+ xhtml:role="alert"
onload="commonDialogOnLoad();"
ondialogaccept="return commonDialogOnAccept();"
ondialogextra1="return commonDialogOnExtra1();"
ondialogextra2="return commonDialogOnExtra2();"
buttonpack="center"
style="min-width: 29em; min-height: 8.5em; -moz-user-focus: ignore;">
<script type="application/javascript" src="chrome://global/content/commonDialog.js"/>
--- a/toolkit/content/widgets/datetimepicker.xml
+++ b/toolkit/content/widgets/datetimepicker.xml
@@ -843,17 +843,16 @@
</binding>
<binding id="datepicker-grid"
extends="chrome://global/content/bindings/datetimepicker.xml#datepicker">
<content>
<vbox class="datepicker-mainbox"
- xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<hbox class="datepicker-monthbox" align="center">
<button class="datepicker-previous datepicker-button" type="repeat"
chromedir="&locale.dir;" xbl:inherits="disabled"
oncommand="document.getBindingParent(this)._increaseOrDecreaseMonth(-1);"/>
<spacer flex="1"/>
<deck anonid="monthlabeldeck">
<label class="datepicker-gridlabel"/>
@@ -870,89 +869,89 @@
<label class="datepicker-gridlabel"/>
</deck>
<label anonid="yearlabel" class="datepicker-gridlabel"/>
<spacer flex="1"/>
<button class="datepicker-next datepicker-button" type="repeat"
chromedir="&locale.dir;" xbl:inherits="disabled"
oncommand="document.getBindingParent(this)._increaseOrDecreaseMonth(1);"/>
</hbox>
- <grid class="datepicker-grid" html:role="wairole:grid">
+ <grid class="datepicker-grid" html:role="grid">
<columns>
<column class="datepicker-gridrow" flex="1"/>
<column class="datepicker-gridrow" flex="1"/>
<column class="datepicker-gridrow" flex="1"/>
<column class="datepicker-gridrow" flex="1"/>
<column class="datepicker-gridrow" flex="1"/>
<column class="datepicker-gridrow" flex="1"/>
<column class="datepicker-gridrow" flex="1"/>
</columns>
<rows anonid="datebox">
<row anonid="dayofweekbox">
- <label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
- <label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
- <label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
- <label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
- <label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
- <label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
- <label class="datepicker-weeklabel" html:role="wairole:columnheader"/>
+ <label class="datepicker-weeklabel" html:role="columnheader"/>
+ <label class="datepicker-weeklabel" html:role="columnheader"/>
+ <label class="datepicker-weeklabel" html:role="columnheader"/>
+ <label class="datepicker-weeklabel" html:role="columnheader"/>
+ <label class="datepicker-weeklabel" html:role="columnheader"/>
+ <label class="datepicker-weeklabel" html:role="columnheader"/>
+ <label class="datepicker-weeklabel" html:role="columnheader"/>
</row>
<row>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
</row>
<row>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
</row>
<row>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
</row>
<row>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
</row>
<row>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
</row>
<row>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
- <label class="datepicker-gridlabel" html:role="wairole:gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
+ <label class="datepicker-gridlabel" html:role="gridcell"/>
</row>
</rows>
</grid>
</vbox>
</content>
<implementation>
<field name="_hasEntry">false</field>
--- a/toolkit/content/widgets/preferences.xml
+++ b/toolkit/content/widgets/preferences.xml
@@ -503,26 +503,25 @@
<binding id="prefwindow"
extends="chrome://global/content/bindings/dialog.xml#dialog">
<resources>
<stylesheet src="chrome://global/skin/preferences.css"/>
</resources>
<content dlgbuttons="accept,cancel" persist="lastSelected screenX screenY"
closebuttonlabel="&preferencesCloseButton.label;"
closebuttonaccesskey="&preferencesCloseButton.accesskey;"
- xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
- xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
- xhtml2:role="wairole:dialog"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
+ xhtml:role="dialog"
#ifdef XP_WIN
title="&preferencesDefaultTitleWin.title;">
#else
title="&preferencesDefaultTitleMac.title;">
#endif
<xul:radiogroup anonid="selector" orient="horizontal" class="paneSelector chromeclass-toolbar"
- xhtml2:role="wairole:list"/> <!-- Expose to accessibility APIs as a list -->
+ xhtml:role="listbox"/> <!-- Expose to accessibility APIs as a listbox -->
<xul:hbox flex="1" class="paneDeckContainer">
<xul:deck anonid="paneDeck" flex="1">
<children includes="prefpane"/>
</xul:deck>
</xul:hbox>
<xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons"
#ifdef XP_UNIX
>
--- a/toolkit/mozapps/extensions/content/extensions.xul
+++ b/toolkit/mozapps/extensions/content/extensions.xul
@@ -47,18 +47,17 @@
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
%brandDTD;
<!ENTITY % extensionsDTD SYSTEM "chrome://mozapps/locale/extensions/extensions.dtd">
%extensionsDTD;
]>
<window xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
- xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
- xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
+ xmlns:xhtml="http://www.w3.org/1999/xhtml"
id="extensionsManager" windowtype="Extension:Manager"
orient="vertical" title="&addons.title;"
screenX="10" screenY="10" width="&em.width;" height="&em.height;"
persist="width height screenX screenY sizemode"
onload="Startup();" onunload="Shutdown();"
onclose="return closeWindow(false);">
<script type="application/javascript" src="chrome://global/content/globalOverlay.js"/>
@@ -147,17 +146,17 @@
<menuitem id="menuitem_includeUpdate" command="cmd_includeUpdate"
label="&cmd.includeUpdate.label;" accesskey="&cmd.includeUpdate.accesskey;"
type="checkbox"/>
</vbox>
<popup id="addonContextMenu" onpopupshowing="return buildContextMenu(event);"/>
<stack id="topStackBar">
- <radiogroup id="viewGroup" xhtml2:role="wairole:list" persist="last-selected"
+ <radiogroup id="viewGroup" xhtml:role="listbox" persist="last-selected"
class="viewSelector chromeclass-toolbar" orient="horizontal">
<radio id="extensions-view" label="&extensions.label;" oncommand="showView('extensions');" persist="last-selected"/>
<radio id="themes-view" label="&themes.label;" oncommand="showView('themes');" persist="last-selected"/>
<radio id="locales-view" label="&locales.label;" oncommand="showView('locales');" persist="last-selected"/>
<radio id="plugins-view" label="&plugins.label;" oncommand="showView('plugins');" persist="last-selected"/>
<radio id="updates-view" label="&update.label;" oncommand="showView('updates');"/>
<radio id="installs-view" label="&install.label;" oncommand="showView('installs');" hidden="true"/>
</radiogroup>
--- a/toolkit/mozapps/preferences/removemp.xul
+++ b/toolkit/mozapps/preferences/removemp.xul
@@ -9,18 +9,16 @@
%removempDTD;
]>
<dialog id="removemp" title="&removePassword.title;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
style="width: 35em;"
ondialogaccept="gRemovePasswordDialog.removePassword();"
onload="gRemovePasswordDialog.init()"
- xmlns:xhtml2="http://www.w3.org/TR/xhtml2"
- xmlns:wairole="http://www.w3.org/2005/01/wai-rdf/GUIRoleTaxonomy#"
xmlns:aaa="http://www.w3.org/2005/07/aaa">
<script type="application/javascript" src="chrome://mozapps/content/preferences/removemp.js"/>
<stringbundle id="bundlePreferences" src="chrome://mozapps/locale/preferences/preferences.properties"/>
<vbox id="warnings">
<description>&removeWarning1.label;</description>
@@ -31,15 +29,15 @@
<groupbox>
<caption label="&removeInfo.label;"/>
<hbox align="center">
<label control="password" value="&setPassword.oldPassword.label;"/>
<textbox id="password" type="password"
oninput="gRemovePasswordDialog.validateInput();"
- xhtml2:role="textfield" aaa:describedby="warnings"/>
+ aaa:describedby="warnings"/>
</hbox>
</groupbox>
<separator/>
</dialog>