Reland "Migrate accessibility/ to ESM internally"
This reverts commit 5a8f4d89e1e624ade403ee72cb4c0de70262a397.
Reason for revert: Use fix as we did for CSSProperties
Original change's description:
> Revert "Migrate accessibility/ to ESM internally"
>
> This reverts commit 785c6a4f1cdd5cea18859badc5beb5518f44f30f.
>
> Reason for revert: Suspected to break "run_type_check.py" on the bot.
> https://ci.chromium.org/p/chromium/builders/try/linux-rel/279842
>
> Original change's description:
> > Migrate accessibility/ to ESM internally
> >
> > Bug: 1006759
> > Change-Id: I9d801349fd73a06d7f72933acfa65b103531a278
> > Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1991511
> > Commit-Queue: Paul Lewis <[email protected]>
> > Reviewed-by: Tim van der Lippe <[email protected]>
>
> [email protected],[email protected]
>
> Change-Id: Ie4fe54b84cf91cd034bfdb21c20b97eaacdb3599
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: 1006759
> Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/1994960
> Commit-Queue: Simon Zünd <[email protected]>
> Reviewed-by: Simon Zünd <[email protected]>
Bug: 1006759
Change-Id: I7e3b3eafd608aa2fa7d05319a9ff0d4947a2dc88
Reviewed-on: https://chromium-review.googlesource.com/c/devtools/devtools-frontend/+/2013148
Reviewed-by: Paul Lewis <[email protected]>
Commit-Queue: Tim van der Lippe <[email protected]>
diff --git a/front_end/accessibility/AccessibilityNodeView.js b/front_end/accessibility/AccessibilityNodeView.js
index 8882b94..8f88d26 100644
--- a/front_end/accessibility/AccessibilityNodeView.js
+++ b/front_end/accessibility/AccessibilityNodeView.js
@@ -1,13 +1,24 @@
// Copyright 2016 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+
+import {AccessibilityNode} from './AccessibilityModel.js'; // eslint-disable-line no-unused-vars
+import {AXAttributes, AXNativeSourceTypes, AXSourceTypes} from './AccessibilityStrings.js';
+import {AccessibilitySubPane} from './AccessibilitySubPane.js';
+
/**
* @unrestricted
*/
-export class AXNodeSubPane extends Accessibility.AccessibilitySubPane {
+export class AXNodeSubPane extends AccessibilitySubPane {
constructor() {
super(ls`Computed Properties`);
+ /**
+ * @protected
+ * @suppress {accessControls}
+ */
+ this._axNode = null;
+
this.contentElement.classList.add('ax-subpane');
this._noNodeInfo = this.createInfo(ls`No accessibility node`);
@@ -22,7 +33,7 @@
}
/**
- * @param {?Accessibility.AccessibilityNode} axNode
+ * @param {?AccessibilityNode} axNode
* @override
*/
setAXNode(axNode) {
@@ -58,8 +69,8 @@
* @param {!Protocol.Accessibility.AXProperty} property
*/
function addIgnoredReason(property) {
- ignoredReasons.appendChild(new Accessibility.AXNodeIgnoredReasonTreeElement(
- property, /** @type {!Accessibility.AccessibilityNode} */ (axNode)));
+ ignoredReasons.appendChild(
+ new AXNodeIgnoredReasonTreeElement(property, /** @type {!AccessibilityNode} */ (axNode)));
}
const ignoredReasonsArray = /** @type {!Array<!Protocol.Accessibility.AXProperty>} */ (axNode.ignoredReasons());
for (const reason of ignoredReasonsArray) {
@@ -82,8 +93,8 @@
* @param {!Protocol.Accessibility.AXProperty} property
*/
function addProperty(property) {
- treeOutline.appendChild(new Accessibility.AXNodePropertyTreePropertyElement(
- property, /** @type {!Accessibility.AccessibilityNode} */ (axNode)));
+ treeOutline.appendChild(
+ new AXNodePropertyTreePropertyElement(property, /** @type {!AccessibilityNode} */ (axNode)));
}
for (const property of axNode.coreProperties()) {
@@ -117,7 +128,7 @@
*/
export class AXNodePropertyTreeElement extends UI.TreeElement {
/**
- * @param {!Accessibility.AccessibilityNode} axNode
+ * @param {!AccessibilityNode} axNode
*/
constructor(axNode) {
// Pass an empty title, the title gets made later in onattach.
@@ -139,7 +150,7 @@
valueElement = createElementWithClass('span', 'monospace');
}
let valueText;
- const isStringProperty = type && Accessibility.AXNodePropertyTreeElement.StringProperties.has(type);
+ const isStringProperty = type && StringProperties.has(type);
if (isStringProperty) {
// Render \n as a nice unicode cr symbol.
valueText = '"' + value.replace(/\n/g, '\u21B5') + '"';
@@ -148,8 +159,8 @@
valueText = String(value);
}
- if (type && type in Accessibility.AXNodePropertyTreeElement.TypeStyles) {
- valueElement.classList.add(Accessibility.AXNodePropertyTreeElement.TypeStyles[type]);
+ if (type && type in TypeStyles) {
+ valueElement.classList.add(TypeStyles[type]);
}
valueElement.setTextContentTruncatedIfNeeded(valueText || '');
@@ -175,7 +186,6 @@
*/
appendNameElement(name) {
const nameElement = createElement('span');
- const AXAttributes = Accessibility.AccessibilityStrings.AXAttributes;
if (name in AXAttributes) {
nameElement.textContent = AXAttributes[name].name;
nameElement.title = AXAttributes[name].description;
@@ -201,12 +211,12 @@
const sources = value.sources;
for (let i = 0; i < sources.length; i++) {
const source = sources[i];
- const child = new Accessibility.AXValueSourceTreeElement(source, this._axNode);
+ const child = new AXValueSourceTreeElement(source, this._axNode);
this.appendChild(child);
}
this.expand();
}
- const element = Accessibility.AXNodePropertyTreeElement.createSimpleValueElement(value.type, String(value.value));
+ const element = AXNodePropertyTreeElement.createSimpleValueElement(value.type, String(value.value));
this.listItemElement.appendChild(element);
}
@@ -217,7 +227,7 @@
appendRelatedNode(relatedNode, index) {
const deferredNode =
new SDK.DeferredDOMNode(this._axNode.accessibilityModel().target(), relatedNode.backendDOMNodeId);
- const nodeTreeElement = new Accessibility.AXRelatedNodeSourceTreeElement({deferredNode: deferredNode}, relatedNode);
+ const nodeTreeElement = new AXRelatedNodeSourceTreeElement({deferredNode: deferredNode}, relatedNode);
this.appendChild(nodeTreeElement);
}
@@ -227,7 +237,7 @@
appendRelatedNodeInline(relatedNode) {
const deferredNode =
new SDK.DeferredDOMNode(this._axNode.accessibilityModel().target(), relatedNode.backendDOMNodeId);
- const linkedNode = new Accessibility.AXRelatedNodeElement({deferredNode: deferredNode}, relatedNode);
+ const linkedNode = new AXRelatedNodeElement({deferredNode: deferredNode}, relatedNode);
this.listItemElement.appendChild(linkedNode.render());
}
@@ -278,7 +288,7 @@
export class AXNodePropertyTreePropertyElement extends AXNodePropertyTreeElement {
/**
* @param {!Protocol.Accessibility.AXProperty} property
- * @param {!Accessibility.AccessibilityNode} axNode
+ * @param {!AccessibilityNode} axNode
*/
constructor(property, axNode) {
super(axNode);
@@ -313,7 +323,7 @@
export class AXValueSourceTreeElement extends AXNodePropertyTreeElement {
/**
* @param {!Protocol.Accessibility.AXValueSource} source
- * @param {!Accessibility.AccessibilityNode} axNode
+ * @param {!AccessibilityNode} axNode
*/
constructor(source, axNode) {
super(axNode);
@@ -335,8 +345,7 @@
appendRelatedNodeWithIdref(relatedNode, index, idref) {
const deferredNode =
new SDK.DeferredDOMNode(this._axNode.accessibilityModel().target(), relatedNode.backendDOMNodeId);
- const nodeTreeElement =
- new Accessibility.AXRelatedNodeSourceTreeElement({deferredNode: deferredNode, idref: idref}, relatedNode);
+ const nodeTreeElement = new AXRelatedNodeSourceTreeElement({deferredNode: deferredNode, idref: idref}, relatedNode);
this.appendChild(nodeTreeElement);
}
@@ -353,7 +362,7 @@
if (matchingNode) {
this.appendRelatedNodeWithIdref(matchingNode, 0, idref);
} else {
- this.listItemElement.appendChild(new Accessibility.AXRelatedNodeElement({idref: idref}).render());
+ this.listItemElement.appendChild(new AXRelatedNodeElement({idref: idref}).render());
}
} else {
@@ -364,7 +373,7 @@
if (matchingNode) {
this.appendRelatedNodeWithIdref(matchingNode, i, idref);
} else {
- this.appendChild(new Accessibility.AXRelatedNodeSourceTreeElement({idref: idref}));
+ this.appendChild(new AXRelatedNodeSourceTreeElement({idref: idref}));
}
}
}
@@ -405,7 +414,6 @@
case AXValueSourceType.Placeholder:
case AXValueSourceType.RelatedElement:
if (source.nativeSource) {
- const AXNativeSourceTypes = Accessibility.AccessibilityStrings.AXNativeSourceTypes;
const nativeSource = source.nativeSource;
nameElement.textContent = AXNativeSourceTypes[nativeSource].name;
nameElement.title = AXNativeSourceTypes[nativeSource].description;
@@ -417,7 +425,6 @@
nameElement.classList.add('monospace');
break;
default:
- const AXSourceTypes = Accessibility.AccessibilityStrings.AXSourceTypes;
if (type in AXSourceTypes) {
nameElement.textContent = AXSourceTypes[type].name;
nameElement.title = AXSourceTypes[type].description;
@@ -434,7 +441,7 @@
this.listItemElement.removeChildren();
if (this._source.invalid) {
- const exclamationMark = Accessibility.AXNodePropertyTreeElement.createExclamationMark(ls`Invalid source.`);
+ const exclamationMark = AXNodePropertyTreeElement.createExclamationMark(ls`Invalid source.`);
this.listItemElement.appendChild(exclamationMark);
this.listItemElement.classList.add('ax-value-source-invalid');
} else if (this._source.superseded) {
@@ -457,7 +464,7 @@
} else if (this._source.value) {
this.appendValueElement(this._source.value);
} else {
- const valueElement = Accessibility.AXNodePropertyTreeElement.createSimpleValueElement(
+ const valueElement = AXNodePropertyTreeElement.createSimpleValueElement(
Protocol.Accessibility.AXValueType.ValueUndefined, ls`Not specified`);
this.listItemElement.appendChild(valueElement);
this.listItemElement.classList.add('ax-value-source-unused');
@@ -481,7 +488,7 @@
super('');
this._value = value;
- this._axRelatedNodeElement = new Accessibility.AXRelatedNodeElement(node, value);
+ this._axRelatedNodeElement = new AXRelatedNodeElement(node, value);
this.selectable = true;
}
@@ -495,7 +502,7 @@
}
if (this._value.text) {
- this.listItemElement.appendChild(Accessibility.AXNodePropertyTreeElement.createSimpleValueElement(
+ this.listItemElement.appendChild(AXNodePropertyTreeElement.createSimpleValueElement(
Protocol.Accessibility.AXValueType.ComputedString, this._value.text));
}
}
@@ -539,7 +546,7 @@
});
} else if (this._idref) {
element.classList.add('invalid');
- valueElement = Accessibility.AXNodePropertyTreeElement.createExclamationMark(ls`No node with this ID.`);
+ valueElement = AXNodePropertyTreeElement.createExclamationMark(ls`No node with this ID.`);
valueElement.createTextChild(this._idref);
element.appendChild(valueElement);
}
@@ -561,7 +568,7 @@
export class AXNodeIgnoredReasonTreeElement extends AXNodePropertyTreeElement {
/**
* @param {!Protocol.Accessibility.AXProperty} property
- * @param {!Accessibility.AccessibilityNode} axNode
+ * @param {!AccessibilityNode} axNode
*/
constructor(property, axNode) {
super(axNode);
@@ -573,7 +580,7 @@
/**
* @param {?string} reason
- * @param {?Accessibility.AccessibilityNode} axNode
+ * @param {?AccessibilityNode} axNode
* @return {?Element}
*/
static createReasonElement(reason, axNode) {
@@ -650,8 +657,7 @@
onattach() {
this.listItemElement.removeChildren();
- this._reasonElement =
- Accessibility.AXNodeIgnoredReasonTreeElement.createReasonElement(this._property.name, this._axNode);
+ this._reasonElement = AXNodeIgnoredReasonTreeElement.createReasonElement(this._property.name, this._axNode);
this.listItemElement.appendChild(this._reasonElement);
const value = this._property.value;
@@ -660,50 +666,3 @@
}
}
}
-
-/* Legacy exported object */
-self.Accessibility = self.Accessibility || {};
-
-/* Legacy exported object */
-Accessibility = Accessibility || {};
-
-/**
- * @constructor
- */
-Accessibility.AXNodeSubPane = AXNodeSubPane;
-
-/**
- * @constructor
- */
-Accessibility.AXNodePropertyTreeElement = AXNodePropertyTreeElement;
-
-/** @type {!Object<string, string>} */
-Accessibility.AXNodePropertyTreeElement.TypeStyles = TypeStyles;
-
-/** @type {!Set.<!Protocol.Accessibility.AXValueType>} */
-Accessibility.AXNodePropertyTreeElement.StringProperties = StringProperties;
-
-/**
- * @constructor
- */
-Accessibility.AXNodePropertyTreePropertyElement = AXNodePropertyTreePropertyElement;
-
-/**
- * @constructor
- */
-Accessibility.AXValueSourceTreeElement = AXValueSourceTreeElement;
-
-/**
- * @constructor
- */
-Accessibility.AXRelatedNodeSourceTreeElement = AXRelatedNodeSourceTreeElement;
-
-/**
- * @constructor
- */
-Accessibility.AXRelatedNodeElement = AXRelatedNodeElement;
-
-/**
- * @constructor
- */
-Accessibility.AXNodeIgnoredReasonTreeElement = AXNodeIgnoredReasonTreeElement;
