From f4292b8e0cbdbe334710b550d45e5681301542f1 Mon Sep 17 00:00:00 2001
From: "aaronleventhal%moonset.net"
 <aaronleventhal%moonset.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 2 Oct 2007 00:57:25 +0000
Subject: [PATCH] bug 397644. Don't process xhtml2:role, r=mano,
 r=philringnalda, r=surkov, sr=neil, a=dsicore

git-svn-id: svn://10.0.0.236/trunk@237040 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/accessible/src/base/nsAccessNode.cpp  |   4 +-
 .../migration/content/migration.xul           |  11 +-
 .../components/preferences/advanced.xul       |   5 +-
 .../safebrowsing/content/warning-overlay.xul  |   5 +-
 mozilla/mail/base/content/newmailalert.xul    |   5 +-
 .../mail/components/preferences/advanced.xul  |  14 +--
 .../components/preferences/changeaction.xul   |   4 +-
 mozilla/suite/common/bindings/prefwindow.xml  |   7 +-
 mozilla/suite/profile/migration/migration.xul |   9 +-
 .../alerts/resources/content/alert.xul        |   5 +-
 mozilla/toolkit/content/commonDialog.xul      |   5 +-
 .../content/widgets/datetimepicker.xml        | 101 +++++++++---------
 .../toolkit/content/widgets/preferences.xml   |   7 +-
 .../mozapps/extensions/content/extensions.xul |   5 +-
 .../toolkit/mozapps/preferences/removemp.xul  |   4 +-
 15 files changed, 84 insertions(+), 107 deletions(-)

diff --git a/mozilla/accessible/src/base/nsAccessNode.cpp b/mozilla/accessible/src/base/nsAccessNode.cpp
index 6436cecf40d..08dd7e9303b 100755
--- a/mozilla/accessible/src/base/nsAccessNode.cpp
+++ b/mozilla/accessible/src/base/nsAccessNode.cpp
@@ -856,9 +856,7 @@ nsAccessNode::GetARIARole(nsIContent *aContent, nsString& aRole)
     }
   }
   // 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;
   }
 
diff --git a/mozilla/browser/components/migration/content/migration.xul b/mozilla/browser/components/migration/content/migration.xul
index cbc8fddd4ec..0b3a4122519 100644
--- a/mozilla/browser/components/migration/content/migration.xul
+++ b/mozilla/browser/components/migration/content/migration.xul
@@ -48,8 +48,7 @@
         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"/>
 
@@ -133,7 +132,7 @@
     <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"
@@ -153,16 +152,14 @@
               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>
diff --git a/mozilla/browser/components/preferences/advanced.xul b/mozilla/browser/components/preferences/advanced.xul
index b40ddd66902..3c24ec5dc29 100644
--- a/mozilla/browser/components/preferences/advanced.xul
+++ b/mozilla/browser/components/preferences/advanced.xul
@@ -53,8 +53,7 @@
 
   <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">
@@ -223,7 +222,7 @@
         <!-- 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;"
diff --git a/mozilla/browser/components/safebrowsing/content/warning-overlay.xul b/mozilla/browser/components/safebrowsing/content/warning-overlay.xul
index 22641ebab52..84da57e9f02 100644
--- a/mozilla/browser/components/safebrowsing/content/warning-overlay.xul
+++ b/mozilla/browser/components/safebrowsing/content/warning-overlay.xul
@@ -34,9 +34,8 @@
       <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">
diff --git a/mozilla/mail/base/content/newmailalert.xul b/mozilla/mail/base/content/newmailalert.xul
index da3cb75e6e0..2f18fe12109 100644
--- a/mozilla/mail/base/content/newmailalert.xul
+++ b/mozilla/mail/base/content/newmailalert.xul
@@ -44,9 +44,8 @@
 <window id="newMailAlertNotification"
         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"
         align="start"
         onload="onAlertLoad()">
   
diff --git a/mozilla/mail/components/preferences/advanced.xul b/mozilla/mail/components/preferences/advanced.xul
index a80d83d3228..3d2453905f7 100644
--- a/mozilla/mail/components/preferences/advanced.xul
+++ b/mozilla/mail/components/preferences/advanced.xul
@@ -48,9 +48,7 @@
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <prefpane id="paneAdvanced" onpaneload="gAdvancedPane.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">
+            xmlns:xhtml="http://www.w3.org/1999/xhtml">
     <script type="application/x-javascript" src="chrome://messenger/content/preferences/advanced.js"/>
 
     <preferences>
@@ -198,18 +196,16 @@
         <!-- Update -->
 
         <tabpanel orient="vertical" align="start">
-          <label>&autoCheck.label;</label>
-          <vbox class="indent">
+          <label control="autoUpdateGroup">&autoCheck.label;</label>
+          <vbox class="indent" id="autoUpdateGroup" xhtml:role="group">
             <checkbox id="enableAppUpdate"
                       label="&enableAppUpdate.label;"
                       accesskey="&enableAppUpdate.accesskey;"
-                      preference="app.update.enabled"
-                      xhtml2:role="wairole:checkbox" aaa:describedby="updateInfo"/>
+                      preference="app.update.enabled"/>
             <checkbox id="enableAddonUpdate"
                       label="&enableAddonsUpdate.label;"
                       accesskey="&enableAddonsUpdate.accesskey;"
-                      preference="extensions.update.enabled"
-                      xhtml2:role="wairole:checkbox" aaa:describedby="updateInfo"/>
+                      preference="extensions.update.enabled"/>
           </vbox>
           <separator/>
           <label id="updateModeLabel">&whenUpdatesFound.label;</label>
diff --git a/mozilla/mail/components/preferences/changeaction.xul b/mozilla/mail/components/preferences/changeaction.xul
index 4457194b743..cdcfe70237a 100644
--- a/mozilla/mail/components/preferences/changeaction.xul
+++ b/mozilla/mail/components/preferences/changeaction.xul
@@ -48,8 +48,6 @@
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="gChangeActionDialog.init();" 
         ondialogaccept="return gChangeActionDialog.onAccept();" 
-        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"         
         style="width: &window.width;;"
         persist="screenX screenY">
@@ -69,7 +67,7 @@
   <vbox id="changeActionContent" flex="1">
     <label control="handlerGroup">&whenDownloading.label;</label>
     <radiogroup id="handlerGroup" onselect="gChangeActionDialog.doEnabling(this.selectedItem);" 
-                flex="1" xhtml2:role="wairole:radiogroup" aaa:describedby="changeActionHeader">
+                flex="1" aaa:describedby="changeActionHeader">
       <separator class="thin"/>
       <radio id="openDefault" value="system" 
              label="&openDefault.label;" accesskey="&openDefault.accesskey;"/>
diff --git a/mozilla/suite/common/bindings/prefwindow.xml b/mozilla/suite/common/bindings/prefwindow.xml
index be4335a2548..2200e5f696a 100644
--- a/mozilla/suite/common/bindings/prefwindow.xml
+++ b/mozilla/suite/common/bindings/prefwindow.xml
@@ -89,9 +89,8 @@
     <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
@@ -99,7 +98,7 @@
 #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:vbox anonid="navTrees">
           <children includes="tree"/>
diff --git a/mozilla/suite/profile/migration/migration.xul b/mozilla/suite/profile/migration/migration.xul
index f2e8fedabce..c038e2ef19a 100644
--- a/mozilla/suite/profile/migration/migration.xul
+++ b/mozilla/suite/profile/migration/migration.xul
@@ -47,8 +47,7 @@
         onunload="MigrationWizard.uninit()"
         style="width: 40em; height: 32em;"
         buttons="accept,cancel"
-        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://communicator/content/migration/migration.js"/>
@@ -95,7 +94,7 @@
     <description control="dataSources">&importItems.label;</description>
 
     <vbox id="dataSources" style="overflow-y: auto;"
-          align="left" flex="1" xhtml2:role="wairole:groupbox"/>
+          align="left" flex="1" xhtml:role="group"/>
   </wizardpage>
 
   <wizardpage id="homePageImport" pageid="homePageImport"
@@ -115,7 +114,7 @@
     <description control="migratingItems">&migrating.label;</description>
 
     <vbox id="migratingItems" style="overflow-y: auto;" align="left"
-          xhtml2:role="wairole:groupbox"/>
+          xhtml:role="group"/>
 
     <hbox>
       <progressmeter class="progressmeter-statusbar" id="progressBar"
@@ -128,6 +127,6 @@
     <description control="doneItems">&done.label;</description>
 
     <vbox id="doneItems" style="overflow-y: auto;" align="left"
-          xhtml2:role="wairole:groupbox"/>
+          xhtml:role="group"/>
   </wizardpage>
 </wizard>
diff --git a/mozilla/toolkit/components/alerts/resources/content/alert.xul b/mozilla/toolkit/components/alerts/resources/content/alert.xul
index fa913b14ffd..a322d3ae8fd 100644
--- a/mozilla/toolkit/components/alerts/resources/content/alert.xul
+++ b/mozilla/toolkit/components/alerts/resources/content/alert.xul
@@ -41,9 +41,8 @@
 <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()">
   
diff --git a/mozilla/toolkit/content/commonDialog.xul b/mozilla/toolkit/content/commonDialog.xul
index 99d1600170e..5bf2e603277 100644
--- a/mozilla/toolkit/content/commonDialog.xul
+++ b/mozilla/toolkit/content/commonDialog.xul
@@ -6,9 +6,8 @@
 
 <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();"
diff --git a/mozilla/toolkit/content/widgets/datetimepicker.xml b/mozilla/toolkit/content/widgets/datetimepicker.xml
index 001347f5d94..5e9fca2de3f 100644
--- a/mozilla/toolkit/content/widgets/datetimepicker.xml
+++ b/mozilla/toolkit/content/widgets/datetimepicker.xml
@@ -848,7 +848,6 @@
 
     <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"
@@ -875,7 +874,7 @@
                   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"/>
@@ -887,67 +886,67 @@
           </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>
diff --git a/mozilla/toolkit/content/widgets/preferences.xml b/mozilla/toolkit/content/widgets/preferences.xml
index 62d052be3f6..328792f1e4a 100644
--- a/mozilla/toolkit/content/widgets/preferences.xml
+++ b/mozilla/toolkit/content/widgets/preferences.xml
@@ -508,16 +508,15 @@
     <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"/>
diff --git a/mozilla/toolkit/mozapps/extensions/content/extensions.xul b/mozilla/toolkit/mozapps/extensions/content/extensions.xul
index 5e911d066a8..d45f47973d1 100644
--- a/mozilla/toolkit/mozapps/extensions/content/extensions.xul
+++ b/mozilla/toolkit/mozapps/extensions/content/extensions.xul
@@ -52,8 +52,7 @@
 
 <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;"
@@ -152,7 +151,7 @@
   <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"/>
diff --git a/mozilla/toolkit/mozapps/preferences/removemp.xul b/mozilla/toolkit/mozapps/preferences/removemp.xul
index 17b1988b128..154d7daf515 100644
--- a/mozilla/toolkit/mozapps/preferences/removemp.xul
+++ b/mozilla/toolkit/mozapps/preferences/removemp.xul
@@ -14,8 +14,6 @@
         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"/>
@@ -36,7 +34,7 @@
       <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>