Bug 1859211: Merge AccessibilityRole and AriaAttributes interfaces into ARIAMixin.webidl to align with the spec. r=nlapre,webidl,edgar

Differential Revision: https://phabricator.services.mozilla.com/D201940

Author: jcsteh

dom/webidl/AriaAttributes.webidl dom/webidl/ARIAMixin.webidl

@@ -4,13 +4,16 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/.
  *
  * The origin of this IDL file is
- * https://rawgit.com/w3c/aria/master/#AriaAttributes
+ * https://w3c.github.io/aria/#ARIAMixin
  *
  * Copyright © 2012 W3C® (MIT, ERCIM, Keio), All Rights Reserved. W3C
  * liability, trademark and document use rules apply.
  */
 
-interface mixin AriaAttributes {
+interface mixin ARIAMixin {
+  [Pref="accessibility.ARIAReflection.enabled", CEReactions, SetterThrows]
+  attribute DOMString? role;
+
   [Pref="accessibility.ARIAReflection.enabled", CEReactions, SetterThrows]
   attribute DOMString? ariaAtomic;
 

dom/webidl/AccessibilityRole.webidl

@@ -311,8 +311,7 @@ Element includes NonDocumentTypeChildNode;
 Element includes ParentNode;
 Element includes Animatable;
 Element includes GeometryUtils;
-Element includes AccessibilityRole;
-Element includes AriaAttributes;
+Element includes ARIAMixin;
 
 // https://fullscreen.spec.whatwg.org/#api
 partial interface Element {

dom/webidl/Element.webidl

@@ -63,8 +63,7 @@ partial interface ElementInternals {
   readonly attribute HTMLElement? validationAnchor;
 };
 
-ElementInternals includes AccessibilityRole;
-ElementInternals includes AriaAttributes;
+ElementInternals includes ARIAMixin;
 
 dictionary ValidityStateFlags {
   boolean valueMissing = false;

dom/webidl/ElementInternals.webidl

@@ -13,10 +13,7 @@ with Files("APZTestData.webidl"):
 with Files("AccessibleNode.webidl"):
     BUG_COMPONENT = ("Core", "Disability Access APIs")
 
-with Files("AccessibilityRole.webidl"):
-    BUG_COMPONENT = ("Core", "Disability Access APIs")
-
-with Files("AriaAttributes.webidl"):
+with Files("ARIAMixin.webidl"):
     BUG_COMPONENT = ("Core", "Disability Access APIs")
 
 with Files("Addon*"):
@@ -402,7 +399,6 @@ WEBIDL_FILES = [
     "AbortSignal.webidl",
     "AbstractRange.webidl",
     "AbstractWorker.webidl",
-    "AccessibilityRole.webidl",
     "AddonManager.webidl",
     "AnalyserNode.webidl",
     "Animatable.webidl",
@@ -415,7 +411,7 @@ WEBIDL_FILES = [
     "AppInfo.webidl",
     "AppNotificationServiceOptions.webidl",
     "APZTestData.webidl",
-    "AriaAttributes.webidl",
+    "ARIAMixin.webidl",
     "Attr.webidl",
     "AudioBuffer.webidl",
     "AudioBufferSourceNode.webidl",