diff options
| author | dmazzoni <dmazzoni@chromium.org> | 2015-11-10 13:06:40 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-10 21:07:40 +0000 |
| commit | 3f6ec08f8035d976cf5fe8a338de3202f42fd152 (patch) | |
| tree | f2f049167acc38f49aa0bedd195339f40a09940f | |
| parent | 86fdcacc0cd81a91645175e488e466e5d827d4ad (diff) | |
| download | chromium_src-3f6ec08f8035d976cf5fe8a338de3202f42fd152.zip chromium_src-3f6ec08f8035d976cf5fe8a338de3202f42fd152.tar.gz chromium_src-3f6ec08f8035d976cf5fe8a338de3202f42fd152.tar.bz2 | |
Switch all LayoutTests to use new AX name calculation
BUG=473220,550663
Review URL: https://codereview.chromium.org/1417213006
Cr-Commit-Position: refs/heads/master@{#358900}
131 files changed, 623 insertions, 907 deletions
diff --git a/components/test_runner/web_ax_object_proxy.cc b/components/test_runner/web_ax_object_proxy.cc index 8c91d97..1c3b8d7 100644 --- a/components/test_runner/web_ax_object_proxy.cc +++ b/components/test_runner/web_ax_object_proxy.cc @@ -259,16 +259,6 @@ std::string RoleToString(blink::WebAXRole role) } } -std::string DeprecatedGetDescription(const blink::WebAXObject& object) { - std::string description = object.deprecatedAccessibilityDescription().utf8(); - return description.insert(0, "AXDescription: "); -} - -std::string DeprecatedGetHelpText(const blink::WebAXObject& object) { - std::string help_text = object.deprecatedHelpText().utf8(); - return help_text.insert(0, "AXHelp: "); -} - std::string GetStringValue(const blink::WebAXObject& object) { std::string value; if (object.role() == blink::WebAXRoleColorWell) { @@ -298,11 +288,6 @@ std::string GetRole(const blink::WebAXObject& object) { return role_string; } -std::string DeprecatedGetTitle(const blink::WebAXObject& object) { - std::string title = object.deprecatedTitle().utf8(); - return title.insert(0, "AXTitle: "); -} - std::string GetValueDescription(const blink::WebAXObject& object) { std::string value_description = object.valueDescription().utf8(); return value_description.insert(0, "AXValueDescription: "); @@ -314,12 +299,11 @@ std::string GetLanguage(const blink::WebAXObject& object) { } std::string GetAttributes(const blink::WebAXObject& object) { - // FIXME: Concatenate all attributes of the AXObject. - std::string attributes(DeprecatedGetTitle(object)); + blink::WebAXNameFrom nameFrom; + blink::WebVector<blink::WebAXObject> nameObjects; + std::string attributes(object.name(nameFrom, nameObjects).utf8()); attributes.append("\n"); attributes.append(GetRole(object)); - attributes.append("\n"); - attributes.append(DeprecatedGetDescription(object)); return attributes; } @@ -596,17 +580,6 @@ WebAXObjectProxy::GetObjectTemplateBuilder(v8::Isolate* isolate) { .SetMethod("removeNotificationListener", &WebAXObjectProxy::UnsetNotificationListener) // - // DEPRECATED accessible name and description accessors - // - .SetProperty("deprecatedTitle", - &WebAXObjectProxy::DeprecatedTitle) - .SetProperty("deprecatedDescription", - &WebAXObjectProxy::DeprecatedDescription) - .SetProperty("deprecatedHelpText", - &WebAXObjectProxy::DeprecatedHelpText) - .SetMethod("deprecatedTitleUIElement", - &WebAXObjectProxy::DeprecatedTitleUIElement) - // // NEW accessible name and description accessors // .SetProperty("name", &WebAXObjectProxy::Name) @@ -667,21 +640,6 @@ std::string WebAXObjectProxy::Role() { return GetRole(accessibility_object_); } -std::string WebAXObjectProxy::DeprecatedTitle() { - accessibility_object_.updateLayoutAndCheckValidity(); - return DeprecatedGetTitle(accessibility_object_); -} - -std::string WebAXObjectProxy::DeprecatedDescription() { - accessibility_object_.updateLayoutAndCheckValidity(); - return DeprecatedGetDescription(accessibility_object_); -} - -std::string WebAXObjectProxy::DeprecatedHelpText() { - accessibility_object_.updateLayoutAndCheckValidity(); - return DeprecatedGetHelpText(accessibility_object_); -} - std::string WebAXObjectProxy::StringValue() { accessibility_object_.updateLayoutAndCheckValidity(); return GetStringValue(accessibility_object_); @@ -1165,15 +1123,6 @@ v8::Local<v8::Object> WebAXObjectProxy::CellForColumnAndRow( return factory_->GetOrCreate(obj); } -v8::Local<v8::Object> WebAXObjectProxy::DeprecatedTitleUIElement() { - accessibility_object_.updateLayoutAndCheckValidity(); - blink::WebAXObject obj = accessibility_object_.deprecatedTitleUIElement(); - if (obj.isNull()) - return v8::Local<v8::Object>(); - - return factory_->GetOrCreate(obj); -} - void WebAXObjectProxy::SetSelectedTextRange(int selection_start, int length) { accessibility_object_.updateLayoutAndCheckValidity(); diff --git a/components/test_runner/web_ax_object_proxy.h b/components/test_runner/web_ax_object_proxy.h index a02f93d..d25fac6 100644 --- a/components/test_runner/web_ax_object_proxy.h +++ b/components/test_runner/web_ax_object_proxy.h @@ -163,13 +163,6 @@ class WebAXObjectProxy : public gin::Wrappable<WebAXObjectProxy> { v8::Local<v8::Object> NextOnLine(); v8::Local<v8::Object> PreviousOnLine(); - // DEPRECATED accessible name and description accessors - std::string DeprecatedTitle(); - std::string DeprecatedDescription(); - std::string DeprecatedHelpText(); - v8::Local<v8::Object> DeprecatedTitleUIElement(); - - // NEW accessible name and description accessors std::string Name(); std::string NameFrom(); int NameElementCount(); diff --git a/content/test/data/accessibility/html/area-expected-mac.txt b/content/test/data/accessibility/html/area-expected-mac.txt index 50bf6b1..ce5d07a 100644 --- a/content/test/data/accessibility/html/area-expected-mac.txt +++ b/content/test/data/accessibility/html/area-expected-mac.txt @@ -2,5 +2,4 @@ AXWebArea AXRoleDescription='HTML content' ++AXGroup AXRoleDescription='group' ++++AXGroup AXRoleDescription='group' AXDescription='pipe' ++++++AXLink AXRoleDescription='link' AXDescription='pipe1' -++++AXLink AXRoleDescription='link' -++++AXUnknown AXRoleDescription='unknown' +++++++AXLink AXRoleDescription='link' AXDescription='pipe2' diff --git a/content/test/data/accessibility/html/area-expected-win.txt b/content/test/data/accessibility/html/area-expected-win.txt index 0d8df9a..b0a2682 100644 --- a/content/test/data/accessibility/html/area-expected-win.txt +++ b/content/test/data/accessibility/html/area-expected-win.txt @@ -1,6 +1,5 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE ++IA2_ROLE_SECTION ++++IA2_ROLE_IMAGE_MAP name='pipe' READONLY -++++++ROLE_SYSTEM_LINK name='pipe1' LINKED -++++ROLE_SYSTEM_LINK FOCUSABLE LINKED -++++ROLE_SYSTEM_CLIENT +++++++ROLE_SYSTEM_LINK name='pipe1' FOCUSABLE LINKED +++++++ROLE_SYSTEM_LINK name='pipe2' LINKED diff --git a/third_party/WebKit/LayoutTests/OilpanExpectations b/third_party/WebKit/LayoutTests/OilpanExpectations index 0a8f440..9bf81c0 100644 --- a/third_party/WebKit/LayoutTests/OilpanExpectations +++ b/third_party/WebKit/LayoutTests/OilpanExpectations @@ -40,4 +40,6 @@ crbug.com/344239 [ Release ] inspector-protocol/heap-profiler/heap-objects-track crbug.com/501229 fast/forms/associatedFormControls-leak-nodes.html [ Failure ] crbug.com/506186 accessibility/axobjectcache-leaks-node.html [ Failure ] +crbug.com/506186 fast/spatial-navigation/snav-imagemap-leak-document.html [ Failure ] + crbug.com/417181 http/tests/xmlhttprequest/abort-on-changestate-headers-received.html [ Failure Pass ] diff --git a/third_party/WebKit/LayoutTests/accessibility/animation-policy-expected.html b/third_party/WebKit/LayoutTests/accessibility/animation-policy-expected.html index 12c0aea..9dfaec8 100644 --- a/third_party/WebKit/LayoutTests/accessibility/animation-policy-expected.html +++ b/third_party/WebKit/LayoutTests/accessibility/animation-policy-expected.html @@ -1,2 +1,2 @@ <img width="100" height="100" -src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAACXBIWXMAAAsTAAALEwEAmpwYAAAB5klEQVR4nO2b0W6CUBAFD6R/2v//BvrSGrjSIF5kBzKTNJrVuKnbs+PVOuQ7U5JkSH6vSSHj45rDQDBu3+XmDM1lcc2BTM1lcc2BwHAgMBwIDAcCw4HAOH4gQ0dNPjCQtQPmqzVxZdE4ZiDzU2d7At2qyYKvQx6l53QqC5Q6jOMG8vcET2/U5MFxA+l9ddWTrBulcr9D5h9k9f6Ca3757/ZP1WDsT0j7JCr0Q+lbWRdYAVdj/0DaIfR8QiZPcFaWUk/Sm5C1U3h21OYo9SSkhEgSpY5DqcPgrCylnkSp4+AkRJIodRxKHcb+d3u33qF9l7WvQ5xRg8H5JwelnuSVgbhiTuV5IEPzc9ZfVfU5pKp/U3t2SFWsq1dWVf+mtkzIRU+3d2I5kIuK8E4odRhKvbq/Uof1V+pslDoMpQ5DqVf3V+qw/kqdjVKHodRhKPXq/kod1l+ps1HqMJQ6DKVe3V+pw/ordTZKHYZSh6HUq/srdVh/pc5GqcPgfB1BkjgQHA4Exqi0WYxKm4UJgWFCYCh1GK4sGK4sGCYEhgmBodRhuLJguLJgmBAYJgSGUofhyoLhyoJhQmCYEBhKHYYrC4YrC4YJgWFCYCh1GK4sGK4sGCYEhgmBodRhuLJguLJgmBAYJgTGD3U74EhlifEGAAAAAElFTkSuQmCC" />
\ No newline at end of file +src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGQAAABkCAYAAABw4pVUAAAACXBIWXMAAAsTAAALEwEAmpwYAAAB5klEQVR4nO2b0W6CUBAFD6R/2v//BvrSGrjSIF5kBzKTNJrVuKnbs+PVOuQ7U5JkSH6vSSHj45rDQDBu3+XmDM1lcc2BTM1lcc2BwHAgMBwIDAcCw4HAOH4gQ0dNPjCQtQPmqzVxZdE4ZiDzU2d7At2qyYKvQx6l53QqC5Q6jOMG8vcET2/U5MFxA+l9ddWTrBulcr9D5h9k9f6Ca3757/ZP1WDsT0j7JCr0Q+lbWRdYAVdj/0DaIfR8QiZPcFaWUk/Sm5C1U3h21OYo9SSkhEgSpY5DqcPgrCylnkSp4+AkRJIodRxKHcb+d3u33qF9l7WvQ5xRg8H5JwelnuSVgbhiTuV5IEPzc9ZfVfU5pKp/U3t2SFWsq1dWVf+mtkzIRU+3d2I5kIuK8E4odRhKvbq/Uof1V+pslDoMpQ5DqVf3V+qw/kqdjVKHodRhKPXq/kod1l+ps1HqMJQ6DKVe3V+pw/ordTZKHYZSh6HUq/srdVh/pc5GqcPgfB1BkjgQHA4Exqi0WYxKm4UJgWFCYCh1GK4sGK4sGCYEhgmBodRhuLJguLJgmBAYJgSGUofhyoLhyoJhQmCYEBhKHYYrC4YrC4YJgWFCYCh1GK4sGK4sGCYEhgmBodRhuLJguLJgmBAYJgTGD3U74EhlifEGAAAAAElFTkSuQmCC" /> diff --git a/third_party/WebKit/LayoutTests/accessibility/animation-policy.html b/third_party/WebKit/LayoutTests/accessibility/animation-policy.html index 365cbab..2d96c4c 100644 --- a/third_party/WebKit/LayoutTests/accessibility/animation-policy.html +++ b/third_party/WebKit/LayoutTests/accessibility/animation-policy.html @@ -34,4 +34,4 @@ function imageLoaded() { </script> <body onload="changeImage()"> <img id="target" src="animation-blue.gif" onload="imageLoaded()"> -</body>
\ No newline at end of file +</body> diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-describedby-on-input-expected.txt b/third_party/WebKit/LayoutTests/accessibility/aria-describedby-on-input-expected.txt index 136d469..416df5c 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-describedby-on-input-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/aria-describedby-on-input-expected.txt @@ -1,4 +1,4 @@ This computer will self-destruct in minutes. Allows you to specify the number of minutes after which the computer will self-destruct. -The accessibility description is "AXHelp: Allows you to specify the number of minutes after which the computer will self-destruct." +The accessibility description is "Allows you to specify the number of minutes after which the computer will self-destruct." diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-describedby-on-input.html b/third_party/WebKit/LayoutTests/accessibility/aria-describedby-on-input.html index e2e5938..8ce4da9 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-describedby-on-input.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-describedby-on-input.html @@ -15,7 +15,7 @@ var labeledItem = document.getElementById("time"); labeledItem.focus(); var result = document.getElementById("result"); - result.innerText = "\nThe accessibility description is \"" + accessibilityController.focusedElement.deprecatedHelpText + "\""; + result.innerText = "\nThe accessibility description is \"" + accessibilityController.focusedElement.description + "\""; } </script> </body> diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-help-expected.txt b/third_party/WebKit/LayoutTests/accessibility/aria-help-expected.txt deleted file mode 100644 index c92a7f0..0000000 --- a/third_party/WebKit/LayoutTests/accessibility/aria-help-expected.txt +++ /dev/null @@ -1,11 +0,0 @@ -button -This tests that aria-help attribute works as expected. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - - -PASS button.deprecatedHelpText is 'AXHelp: click here' -PASS successfullyParsed is true - -TEST COMPLETE - diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-help.html b/third_party/WebKit/LayoutTests/accessibility/aria-help.html deleted file mode 100644 index c946578..0000000 --- a/third_party/WebKit/LayoutTests/accessibility/aria-help.html +++ /dev/null @@ -1,29 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> -<html> -<head> -<script src="../resources/js-test.js"></script> -</head> -<body id="body"> - -<div id="button" tabindex=0 role="button" aria-label="title" aria-help="click here"> -button -</div> - -<p id="description"></p> -<div id="console"></div> - -<script> - - description("This tests that aria-help attribute works as expected."); - - if (window.accessibilityController) { - - document.getElementById("button").focus(); - var button = accessibilityController.focusedElement; - shouldBe("button.deprecatedHelpText", "'AXHelp: click here'"); - } - -</script> - -</body> -</html> diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-hidden-children-not-in-text-from-content-expected.txt b/third_party/WebKit/LayoutTests/accessibility/aria-hidden-children-not-in-text-from-content-expected.txt index ecfa0a9..89e2380 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-hidden-children-not-in-text-from-content-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/aria-hidden-children-not-in-text-from-content-expected.txt @@ -4,8 +4,8 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE -PASS checkbox1.deprecatedTitle.trim() is 'AXTitle:' -PASS checkbox2.deprecatedTitle.trim() is 'AXTitle: Non-hidden descendant content' +PASS checkbox1.name.trim() is '' +PASS checkbox2.name.trim() is 'Non-hidden descendant content' PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-hidden-children-not-in-text-from-content.html b/third_party/WebKit/LayoutTests/accessibility/aria-hidden-children-not-in-text-from-content.html index e34d7a0..e0cd158 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-hidden-children-not-in-text-from-content.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-hidden-children-not-in-text-from-content.html @@ -26,11 +26,11 @@ description('This tests that aria-hidden elements within an element are ' + if (window.testRunner && window.accessibilityController) { var checkbox1 = accessibilityController.accessibleElementById('checkbox1'); - shouldBe('checkbox1.deprecatedTitle.trim()', "'AXTitle:'"); + shouldBe('checkbox1.name.trim()', "''"); var checkbox2 = accessibilityController.accessibleElementById('checkbox2'); - shouldBe('checkbox2.deprecatedTitle.trim()', - "'AXTitle: Non-hidden descendant content'"); + shouldBe('checkbox2.name.trim()', + "'Non-hidden descendant content'"); document.getElementById('content').style.visibility = 'hidden'; } diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-hidden-expected.txt b/third_party/WebKit/LayoutTests/accessibility/aria-hidden-expected.txt index 4208128..b05dc8f 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-hidden-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/aria-hidden-expected.txt @@ -7,7 +7,7 @@ This tests that the aria-hidden attribute works correctly with accessibility. Th On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS h2.deprecatedTitle is 'AXTitle: h2' +PASS h2.name is 'h2' PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-hidden.html b/third_party/WebKit/LayoutTests/accessibility/aria-hidden.html index 94507f3..4fce4bc 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-hidden.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-hidden.html @@ -18,7 +18,7 @@ var body = document.getElementById("body"); body.focus(); var h2 = accessibilityController.focusedElement.childAtIndex(0); - shouldBe("h2.deprecatedTitle", "'AXTitle: h2'"); + shouldBe("h2.name", "'h2'"); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-label.html b/third_party/WebKit/LayoutTests/accessibility/aria-label.html index 28edafc..6daa5ee 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-label.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-label.html @@ -18,11 +18,11 @@ var body = document.getElementById("body"); body.focus(); var obj = accessibilityController.focusedElement.childAtIndex(0).childAtIndex(0); - var succeeded = obj.deprecatedDescription == "AXDescription: aria label"; + var succeeded = obj.name == "aria label"; shouldBe("succeeded", "true"); obj = accessibilityController.focusedElement.childAtIndex(0).childAtIndex(1); - succeeded = obj.deprecatedDescription == "AXDescription: aria link"; + succeeded = obj.name == "aria link"; shouldBe("succeeded", "true"); } diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-on-input-expected.txt b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-on-input-expected.txt index c9b6426..d165cd40 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-on-input-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-on-input-expected.txt @@ -1,3 +1,3 @@ This computer will self-destruct in minutes. -The accessibility description is "AXDescription: Note: This computer will self-destruct in 10 minutes." +The accessibility description is "Note: This computer will self-destruct in 10 minutes." diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-on-input.html b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-on-input.html index f8cff72..ddade85 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-on-input.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-on-input.html @@ -15,7 +15,7 @@ var labeledItem = document.getElementById("time"); labeledItem.focus(); var result = document.getElementById("result"); - result.innerText = "\nThe accessibility description is \"" + accessibilityController.focusedElement.deprecatedDescription + "\""; + result.innerText = "\nThe accessibility description is \"" + accessibilityController.focusedElement.name + "\""; } </script> </body> diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-label-expected.txt b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-label-expected.txt index cff61a3..dd119a1 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-label-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-label-expected.txt @@ -1,12 +1,8 @@ This tests that if aria-labelledby is used, then aria-label attributes are not used. Alpha Beta Delta Eta Epsilon Theta -usingNone.deprecatedTitle: [AXTitle: Alpha] -usingNone.deprecatedDescription: [AXDescription: ] -usingLabel.deprecatedTitle: [AXTitle: Beta] -usingLabel.deprecatedDescription: [AXDescription: Gamma] -usingLabelledby.deprecatedTitle: [AXTitle: Delta] -usingLabelledby.deprecatedDescription: [AXDescription: Epsilon] -usingLabeledby.deprecatedTitle: [AXTitle: Eta] -usingLabeledby.deprecatedDescription: [AXDescription: Theta] +usingNone.name: [Alpha] +usingLabel.name: [Gamma] +usingLabelledby.name: [Epsilon] +usingLabeledby.name: [Theta] diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-label.html b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-label.html index a1b3516..ac8193e 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-label.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-label.html @@ -34,20 +34,16 @@ if (window.accessibilityController) { var usingNone = getAccessibilityObject("using-none"); - output("usingNone.deprecatedTitle: [" + usingNone.deprecatedTitle + "]"); - output("usingNone.deprecatedDescription: [" + usingNone.deprecatedDescription + "]"); + output("usingNone.name: [" + usingNone.name + "]"); var usingLabel = getAccessibilityObject("using-label"); - output("usingLabel.deprecatedTitle: [" + usingLabel.deprecatedTitle + "]"); - output("usingLabel.deprecatedDescription: [" + usingLabel.deprecatedDescription + "]"); + output("usingLabel.name: [" + usingLabel.name + "]"); var usingLabelledby = getAccessibilityObject("using-labelledby"); - output("usingLabelledby.deprecatedTitle: [" + usingLabelledby.deprecatedTitle + "]"); - output("usingLabelledby.deprecatedDescription: [" + usingLabelledby.deprecatedDescription + "]"); + output("usingLabelledby.name: [" + usingLabelledby.name + "]"); var usingLabeledby = getAccessibilityObject("using-labeledby"); - output("usingLabeledby.deprecatedTitle: [" + usingLabeledby.deprecatedTitle + "]"); - output("usingLabeledby.deprecatedDescription: [" + usingLabeledby.deprecatedDescription + "]"); + output("usingLabeledby.name: [" + usingLabeledby.name + "]"); } successfullyParsed = true; diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby-expected.txt b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby-expected.txt index 0c6a87f..7695254 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby-expected.txt @@ -1,10 +1,7 @@ This tests that if both aria-labeledby and aria-labelledby are used (for reasons best known to the page author), then aria-labelledby is preferred. Delta Eta Eta Using aria-labelledby Using aria-labeledby -usingLabelledby.deprecatedTitle: [AXTitle: Delta] -usingLabelledby.deprecatedDescription: [AXDescription: Using aria-labelledby] -usingLabeledby.deprecatedTitle: [AXTitle: Eta] -usingLabeledby.deprecatedDescription: [AXDescription: Using aria-labeledby] -usingLabeledbyAndLabelledby.deprecatedTitle: [AXTitle: Eta] -usingLabeledbyAndLabelledby.deprecatedDescription: [AXDescription: Using aria-labelledby] +usingLabelledby.name: [Using aria-labelledby] +usingLabeledby.name: [Using aria-labeledby] +usingLabeledbyAndLabelledby.name: [Using aria-labelledby] diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby.html b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby.html index c90f966..e908966 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-aria-labeledby.html @@ -33,16 +33,13 @@ if (window.accessibilityController) { var usingLabelledby = getAccessibilityObject("using-labelledby"); - output("usingLabelledby.deprecatedTitle: [" + usingLabelledby.deprecatedTitle + "]"); - output("usingLabelledby.deprecatedDescription: [" + usingLabelledby.deprecatedDescription + "]"); + output("usingLabelledby.name: [" + usingLabelledby.name + "]"); var usingLabeledby = getAccessibilityObject("using-labeledby"); - output("usingLabeledby.deprecatedTitle: [" + usingLabeledby.deprecatedTitle + "]"); - output("usingLabeledby.deprecatedDescription: [" + usingLabeledby.deprecatedDescription + "]"); + output("usingLabeledby.name: [" + usingLabeledby.name + "]"); var usingLabeledbyAndLabelledby = getAccessibilityObject("using-labeledby-and-labelledby"); - output("usingLabeledbyAndLabelledby.deprecatedTitle: [" + usingLabeledbyAndLabelledby.deprecatedTitle + "]"); - output("usingLabeledbyAndLabelledby.deprecatedDescription: [" + usingLabeledbyAndLabelledby.deprecatedDescription + "]"); + output("usingLabeledbyAndLabelledby.name: [" + usingLabeledbyAndLabelledby.name + "]"); } diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-label-expected.txt b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-label-expected.txt index 7c8fda71..446dd2f 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-label-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-label-expected.txt @@ -1,12 +1,15 @@ -Shut down computer after minutes +Label +A +B +C + This tests that if aria-labelledby is used, then label elements are not used On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS text.deprecatedDescription is 'AXDescription: Shut down computer after 10 minutes' -PASS text.deprecatedTitleUIElement() != null && text.deprecatedTitleUIElement().isValid is false -Label element role is: AXRole: AXLabel +PASS axTarget.name is 'A B C' +PASS axTarget.nameElementCount() is 3 PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-label.html b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-label.html index 5427ae5..0d61a73 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-label.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-overrides-label.html @@ -5,9 +5,13 @@ </head> <body id="body"> -<span id="labelShutdown"><label id="labelElement" for="shutdownTime">Shut down computer after</label></span> -<input id="shutdownTime" type="text" value="10" aria-labelledby="labelShutdown shutdownTime shutdownUnit" /> -<span id="shutdownUnit">minutes</span> +<label for="target">Label</label> + +<div id="a">A</div> +<div id="b">B</div> +<div id="c">C</div> + +<input id="target" aria-labelledby="a b c" value="10"> <p id="description"></p> <div id="console"></div> @@ -17,20 +21,9 @@ description("This tests that if aria-labelledby is used, then label elements are not used"); if (window.accessibilityController) { - - var text = document.getElementById("shutdownTime"); - text.focus(); - text = accessibilityController.focusedElement; - - shouldBe("text.deprecatedDescription", "'AXDescription: Shut down computer after 10 minutes'"); - - // There should be no title UI element. - shouldBe("text.deprecatedTitleUIElement() != null && text.deprecatedTitleUIElement().isValid", "false"); - - var labelElement = accessibilityController.accessibleElementById("labelElement"); - // This just makes sure that the label element is still visible in the AX hierarchy, even though - // it's a label element (sometimes they are ignored). - debug("Label element role is: " + labelElement.role); + var axTarget = accessibilityController.accessibleElementById("target"); + shouldBe("axTarget.name", "'A B C'"); + shouldBe("axTarget.nameElementCount()", "3"); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-stay-within.html b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-stay-within.html index f17a684..5b13ff3 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-stay-within.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-labelledby-stay-within.html @@ -32,11 +32,11 @@ var labeledItem = document.getElementById("rep"); labeledItem.focus(); var result = document.getElementById("result"); - if ( accessibilityController.focusedElement.deprecatedDescription == "AXDescription: Reply Item Five" ) { + if ( accessibilityController.focusedElement.name == "Reply Item Five" ) { result.innerText = "Passed"; } else { - result.innerText = "Failed. Result ==" + accessibilityController.focusedElement.deprecatedDescription + "=="; + result.innerText = "Failed. Result ==" + accessibilityController.focusedElement.name + "=="; } } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-option-role-expected.txt b/third_party/WebKit/LayoutTests/accessibility/aria-option-role-expected.txt index 53b7f87..125fa09 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-option-role-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/aria-option-role-expected.txt @@ -6,9 +6,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE firstChild.role is AXRole: AXListBoxOption -PASS firstChild.deprecatedTitle is 'AXTitle: option 1' +PASS firstChild.name is 'option 1' secondChild.role is AXRole: AXListBoxOption -PASS secondChild.deprecatedDescription is 'AXDescription: label 2' +PASS secondChild.name is 'label 2' PASS firstChild.childrenCount is 0 PASS secondChild.childrenCount is 0 PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-option-role.html b/third_party/WebKit/LayoutTests/accessibility/aria-option-role.html index 0fb65ab..139f074 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-option-role.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-option-role.html @@ -26,10 +26,10 @@ var firstChild = listBox.childAtIndex(0); var secondChild = listBox.childAtIndex(1); debug("firstChild.role is " + firstChild.role); - shouldBe("firstChild.deprecatedTitle", "'AXTitle: option 1'"); + shouldBe("firstChild.name", "'option 1'"); debug("secondChild.role is " + secondChild.role); - shouldBe("secondChild.deprecatedDescription", "'AXDescription: label 2'"); + shouldBe("secondChild.name", "'label 2'"); shouldBe("firstChild.childrenCount", "0"); shouldBe("secondChild.childrenCount", "0"); diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-owns.html b/third_party/WebKit/LayoutTests/accessibility/aria-owns.html index 68d9ca8..c47022c 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-owns.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-owns.html @@ -25,14 +25,14 @@ test(function(t) assert_equals(axList1.childrenCount, 3); var axItem = axList1.childAtIndex(0); - assert_equals(axList1.childAtIndex(0).deprecatedTitle, "AXTitle: One"); - assert_equals(axList1.childAtIndex(1).deprecatedTitle, "AXTitle: Two"); - assert_equals(axList1.childAtIndex(2).deprecatedTitle, "AXTitle: Three"); + assert_equals(axList1.childAtIndex(0).name, "One"); + assert_equals(axList1.childAtIndex(1).name, "Two"); + assert_equals(axList1.childAtIndex(2).name, "Three"); var axList2 = accessibilityController.accessibleElementById("list2"); assert_equals(axList2.role, "AXRole: AXList"); assert_equals(axList2.childrenCount, 1); - assert_equals(axList2.childAtIndex(0).deprecatedTitle, "AXTitle: Four"); + assert_equals(axList2.childAtIndex(0).name, "Four"); }, "Aria-owns moves an element from one part of the tree to another."); </script> @@ -57,12 +57,12 @@ test(function(t) assert_true(axActualParent.isEqual(axParent1) || axActualParent.isEqual(axParent2)); if (axActualParent.isEqual(axParent1)) { assert_equals(axParent1.childrenCount, 1); - assert_equals(axParent1.childAtIndex(0).deprecatedTitle, "AXTitle: Child"); + assert_equals(axParent1.childAtIndex(0).name, "Child"); assert_equals(axParent2.childrenCount, 0); } else { assert_equals(axParent1.childrenCount, 0); assert_equals(axParent2.childrenCount, 1); - assert_equals(axParent2.childAtIndex(0).deprecatedTitle, "AXTitle: Child"); + assert_equals(axParent2.childAtIndex(0).name, "Child"); } assert_equals(axParent3.childrenCount, 0); }, "If two nodes own (using aria-owns) the same element by id, only one gets to be the owner."); diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-tab-roles-expected.txt b/third_party/WebKit/LayoutTests/accessibility/aria-tab-roles-expected.txt index 279579df..bb19768 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-tab-roles-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/aria-tab-roles-expected.txt @@ -9,10 +9,10 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE tabList.role = AXRole: AXTabList tab1.role = AXRole: AXTab -PASS tab1.deprecatedTitle is 'AXTitle: Crust' +PASS tab1.name is 'Crust' PASS tab1.childrenCount is 0 tab2.role = AXRole: AXTab -PASS tab2.deprecatedTitle is 'AXTitle: Veges' +PASS tab2.name is 'Veges' tabPanel.role = AXRole: AXTabPanel tabPanel.subrole = undefined PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-tab-roles.html b/third_party/WebKit/LayoutTests/accessibility/aria-tab-roles.html index 0c12e30..313a984 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-tab-roles.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-tab-roles.html @@ -34,10 +34,10 @@ debug("tabList.role = " + tabList.role); debug("tab1.role = " + tab1.role); - shouldBe("tab1.deprecatedTitle", "'AXTitle: Crust'"); + shouldBe("tab1.name", "'Crust'"); shouldBe("tab1.childrenCount", "0"); debug("tab2.role = " + tab2.role); - shouldBe("tab2.deprecatedTitle", "'AXTitle: Veges'"); + shouldBe("tab2.name", "'Veges'"); debug("tabPanel.role = " + tabPanel.role); debug("tabPanel.subrole = " + tabPanel.subrole); } diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-toggle-button-with-title-expected.txt b/third_party/WebKit/LayoutTests/accessibility/aria-toggle-button-with-title-expected.txt index fdd5929..d10cef3 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-toggle-button-with-title-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/aria-toggle-button-with-title-expected.txt @@ -9,7 +9,7 @@ PASS successfullyParsed is true TEST COMPLETE Role: AXRole: AXToggleButton -PASS tbutton1.deprecatedTitle is 'AXTitle: Toggle button' +PASS tbutton1.name is 'Toggle button' Role: AXRole: AXButton -PASS button.deprecatedTitle is 'AXTitle: Button title' +PASS button.name is 'Button title' diff --git a/third_party/WebKit/LayoutTests/accessibility/aria-toggle-button-with-title.html b/third_party/WebKit/LayoutTests/accessibility/aria-toggle-button-with-title.html index 3e11c14..cf786f0 100644 --- a/third_party/WebKit/LayoutTests/accessibility/aria-toggle-button-with-title.html +++ b/third_party/WebKit/LayoutTests/accessibility/aria-toggle-button-with-title.html @@ -11,12 +11,12 @@ function runTest() document.getElementById("tbutton").focus(); tbutton1 = accessibilityController.focusedElement; debug("Role: " + tbutton1.role); - shouldBe("tbutton1.deprecatedTitle", "'AXTitle: Toggle button'"); + shouldBe("tbutton1.name", "'Toggle button'"); document.getElementById("button").focus(); button = accessibilityController.focusedElement; debug("Role: " + button.role); - shouldBe("button.deprecatedTitle", "'AXTitle: Button title'"); + shouldBe("button.name", "'Button title'"); } } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/br-element-has-correct-title-expected.txt b/third_party/WebKit/LayoutTests/accessibility/br-element-has-correct-title-expected.txt index eadd0aa..c4f13fd 100644 --- a/third_party/WebKit/LayoutTests/accessibility/br-element-has-correct-title-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/br-element-has-correct-title-expected.txt @@ -6,7 +6,7 @@ This tests that a br element will return the newline character as its accessible On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS brElement.deprecatedTitle is 'AXTitle: \n' +PASS brElement.name is '\n' PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/br-element-has-correct-title.html b/third_party/WebKit/LayoutTests/accessibility/br-element-has-correct-title.html index 34860f1..943ff6c 100644 --- a/third_party/WebKit/LayoutTests/accessibility/br-element-has-correct-title.html +++ b/third_party/WebKit/LayoutTests/accessibility/br-element-has-correct-title.html @@ -15,7 +15,7 @@ if (window.accessibilityController) { var brElement = accessibilityController.accessibleElementById("br"); - shouldBe("brElement.deprecatedTitle", "'AXTitle: \\n'"); + shouldBe("brElement.name", "'\\n'"); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/button-title-uses-inner-img-alt-expected.txt b/third_party/WebKit/LayoutTests/accessibility/button-title-uses-inner-img-alt-expected.txt index 730af57..f5382f5 100644 --- a/third_party/WebKit/LayoutTests/accessibility/button-title-uses-inner-img-alt-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/button-title-uses-inner-img-alt-expected.txt @@ -5,7 +5,7 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE PASS document.activeElement == button is true -PASS axButton.deprecatedTitle.indexOf('Button with image of cake') >= 0 is true +PASS axButton.name.indexOf('Button with image of cake') >= 0 is true PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/button-title-uses-inner-img-alt.html b/third_party/WebKit/LayoutTests/accessibility/button-title-uses-inner-img-alt.html index e9aa803..d996412 100644 --- a/third_party/WebKit/LayoutTests/accessibility/button-title-uses-inner-img-alt.html +++ b/third_party/WebKit/LayoutTests/accessibility/button-title-uses-inner-img-alt.html @@ -22,7 +22,7 @@ if (window.testRunner && window.accessibilityController) { button.focus(); shouldBe("document.activeElement == button", "true"); window.axButton = accessibilityController.focusedElement; - shouldBe("axButton.deprecatedTitle.indexOf('Button with image of cake') >= 0", "true"); + shouldBe("axButton.name.indexOf('Button with image of cake') >= 0", "true"); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/calling-accessibility-methods-with-pending-layout-causes-crash.html b/third_party/WebKit/LayoutTests/accessibility/calling-accessibility-methods-with-pending-layout-causes-crash.html index 9511747..5af91d2 100644 --- a/third_party/WebKit/LayoutTests/accessibility/calling-accessibility-methods-with-pending-layout-causes-crash.html +++ b/third_party/WebKit/LayoutTests/accessibility/calling-accessibility-methods-with-pending-layout-causes-crash.html @@ -12,6 +12,6 @@ var link = document.getElementById("link"); link.focus(); link.style.display = "block"; - accessibilityController.focusedElement.deprecatedDescription; + accessibilityController.focusedElement.name; </script> </body> diff --git a/third_party/WebKit/LayoutTests/accessibility/canvas-description-and-role-expected.txt b/third_party/WebKit/LayoutTests/accessibility/canvas-description-and-role-expected.txt index d17fa8b..c9e1b6c 100644 --- a/third_party/WebKit/LayoutTests/accessibility/canvas-description-and-role-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/canvas-description-and-role-expected.txt @@ -4,9 +4,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE PASS axContainer.childrenCount is 2 -Canvas 1 description: AXDescription: Canvas label +Canvas 1 description: Canvas label Canvas 1 role: AXRole: AXCanvas -Canvas 2 description: AXDescription: +Canvas 2 description: Canvas 2 role: AXRole: AXCanvasWithFallbackContent PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/accessibility/canvas-description-and-role.html b/third_party/WebKit/LayoutTests/accessibility/canvas-description-and-role.html index 82dbcbb..67f1057 100644 --- a/third_party/WebKit/LayoutTests/accessibility/canvas-description-and-role.html +++ b/third_party/WebKit/LayoutTests/accessibility/canvas-description-and-role.html @@ -21,11 +21,11 @@ if (window.testRunner && window.accessibilityController) { shouldBe("axContainer.childrenCount", "2"); var axCanvas1 = axContainer.childAtIndex(0); - debug('Canvas 1 description: ' + axCanvas1.deprecatedDescription); + debug('Canvas 1 description: ' + axCanvas1.name); debug('Canvas 1 role: ' + axCanvas1.role); var axCanvas2 = axContainer.childAtIndex(1); - debug('Canvas 2 description: ' + axCanvas2.deprecatedDescription); + debug('Canvas 2 description: ' + axCanvas2.name); debug('Canvas 2 role: ' + axCanvas2.role); } diff --git a/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2-expected.txt b/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2-expected.txt index f6e8601..eb95df6 100644 --- a/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2-expected.txt @@ -19,7 +19,7 @@ link2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -36,7 +36,7 @@ button2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -53,7 +53,7 @@ labeled-button2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -70,7 +70,7 @@ button-with-title2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -87,7 +87,7 @@ text2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -104,7 +104,7 @@ checkbox2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -121,7 +121,7 @@ number2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -138,7 +138,7 @@ radio2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -155,7 +155,7 @@ slider2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -172,7 +172,7 @@ submit2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -189,7 +189,7 @@ combobox2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -206,7 +206,7 @@ listbox2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -223,7 +223,7 @@ textarea2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -240,7 +240,7 @@ focusable2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -257,7 +257,7 @@ heading2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -274,7 +274,7 @@ aria-button2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -291,7 +291,7 @@ aria-disabledbutton2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -308,7 +308,7 @@ aria-enabledbutton2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -325,7 +325,7 @@ aria-requiredbutton2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -342,7 +342,7 @@ aria-togglebutton2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue @@ -359,7 +359,7 @@ aria-link2 PASS document.activeElement == element2 is true PASS axElement2.role is axElement1.role PASS axElement2.roleDescription is axElement1.roleDescription -PASS axElement2.deprecatedTitle is axElement1.deprecatedTitle +PASS axElement2.name is axElement1.deprecatedTitle PASS axElement2.deprecatedDescription is axElement1.deprecatedDescription PASS axElement2.deprecatedHelpText is axElement1.deprecatedHelpText PASS axElement2.stringValue is axElement1.stringValue diff --git a/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2.html b/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2.html index 714bba2..c8158bf 100644 --- a/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2.html +++ b/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-2.html @@ -73,9 +73,9 @@ if (window.testRunner && window.accessibilityController) { shouldBe("axElement2.role", "axElement1.role"); shouldBe("axElement2.roleDescription", "axElement1.roleDescription"); - shouldBe("axElement2.deprecatedTitle", "axElement1.deprecatedTitle"); - shouldBe("axElement2.deprecatedDescription", "axElement1.deprecatedDescription"); - shouldBe("axElement2.deprecatedHelpText", "axElement1.deprecatedHelpText"); + shouldBe("axElement2.name", "axElement1.name"); + shouldBe("axElement2.name", "axElement1.name"); + shouldBe("axElement2.description", "axElement1.deprecatedHelpText"); shouldBe("axElement2.stringValue", "axElement1.stringValue"); shouldBe("axElement2.isEnabled", "axElement1.isEnabled"); shouldBe("axElement2.isRequired", "axElement1.isRequired"); diff --git a/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-labels-expected.txt b/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-labels-expected.txt index fdcd662..dd28050 100644 --- a/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-labels-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-labels-expected.txt @@ -1,4 +1,3 @@ -Nothing Text Checkbox Radio Slider List Text with label for This tests that labels and elements with labels in canvas fallback content have the same accessibility properties as those same elements outside of a canvas. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". @@ -6,64 +5,64 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE Checking accessibility properties for ids: nothing1, nothing2 PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement +PASS collapseWhitespace(axElement2.name) is collapseWhitespace(axElement1.name) +PASS axElement2.nameElementCount() is axElement1.nameElementCount() Checking accessibility properties for ids: text_label1, text_label2 PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement +PASS collapseWhitespace(axElement2.name) is collapseWhitespace(axElement1.name) +PASS axElement2.nameElementCount() is axElement1.nameElementCount() Checking accessibility properties for ids: text1, text2 PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement +PASS collapseWhitespace(axElement2.name) is collapseWhitespace(axElement1.name) +PASS axElement2.nameElementCount() is axElement1.nameElementCount() Checking accessibility properties for ids: check_label1, check_label2 PASS axElement1 == null && axElement2 == null is true Checking accessibility properties for ids: check1, check2 PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement +PASS collapseWhitespace(axElement2.name) is collapseWhitespace(axElement1.name) +PASS axElement2.nameElementCount() is axElement1.nameElementCount() Checking accessibility properties for ids: radio_label1, radio_label2 PASS axElement1 == null && axElement2 == null is true Checking accessibility properties for ids: radio1, radio2 PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement +PASS collapseWhitespace(axElement2.name) is collapseWhitespace(axElement1.name) +PASS axElement2.nameElementCount() is axElement1.nameElementCount() Checking accessibility properties for ids: slider_label1, slider_label2 PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement +PASS collapseWhitespace(axElement2.name) is collapseWhitespace(axElement1.name) +PASS axElement2.nameElementCount() is axElement1.nameElementCount() Checking accessibility properties for ids: slider1, slider2 PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement +PASS collapseWhitespace(axElement2.name) is collapseWhitespace(axElement1.name) +PASS axElement2.nameElementCount() is axElement1.nameElementCount() Checking accessibility properties for ids: list_label1, list_label2 PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement +PASS collapseWhitespace(axElement2.name) is collapseWhitespace(axElement1.name) +PASS axElement2.nameElementCount() is axElement1.nameElementCount() Checking accessibility properties for ids: list1, list2 PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement +PASS collapseWhitespace(axElement2.name) is collapseWhitespace(axElement1.name) +PASS axElement2.nameElementCount() is axElement1.nameElementCount() Checking accessibility properties for ids: label_for1, label_for2 PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement +PASS collapseWhitespace(axElement2.name) is collapseWhitespace(axElement1.name) +PASS axElement2.nameElementCount() is axElement1.nameElementCount() Checking accessibility properties for ids: text_for1, text_for2 PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement +PASS collapseWhitespace(axElement2.name) is collapseWhitespace(axElement1.name) +PASS axElement2.nameElementCount() is axElement1.nameElementCount() PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-labels.html b/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-labels.html index 136eb02..d3452e2 100644 --- a/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-labels.html +++ b/third_party/WebKit/LayoutTests/accessibility/canvas-fallback-content-labels.html @@ -3,7 +3,7 @@ <body> <script src="../resources/js-test.js"></script> -<div> +<div id="container"> <label id="nothing1">Nothing</label> <label id="text_label1"> Text @@ -81,8 +81,8 @@ if (window.testRunner && window.accessibilityController) { return; } shouldBe("axElement2.role", "axElement1.role"); - shouldBe("collapseWhitespace(axElement2.deprecatedTitle)", "collapseWhitespace(axElement1.deprecatedTitle)"); - shouldBe("axElement2.deprecatedTitleUIElement", "axElement1.deprecatedTitleUIElement"); + shouldBe("collapseWhitespace(axElement2.name)", "collapseWhitespace(axElement1.name)"); + shouldBe("axElement2.nameElementCount()", "axElement1.nameElementCount()"); debug(""); } @@ -99,6 +99,8 @@ if (window.testRunner && window.accessibilityController) { check("list1", "list2"); check("label_for1", "label_for2"); check("text_for1", "text_for2"); + + document.getElementById("container").style.display = "none"; } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/computed-text-with-height-0.html b/third_party/WebKit/LayoutTests/accessibility/computed-text-with-height-0.html index f074dbb..7cd2e8ab 100644 --- a/third_party/WebKit/LayoutTests/accessibility/computed-text-with-height-0.html +++ b/third_party/WebKit/LayoutTests/accessibility/computed-text-with-height-0.html @@ -15,7 +15,7 @@ <script> test(function(t){ var axButton = accessibilityController.accessibleElementById("button"); - assert_equals(axButton.deprecatedTitle, "AXTitle: Friend Requests: 0"); + assert_equals(axButton.name, "Friend Requests: 0"); assert_equals(axButton.name, "Friend Requests: 0"); }, "Text with height:0, position:absolute, and overflow:hidden should still be included in the accessible text computation."); </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/display-none-change.html b/third_party/WebKit/LayoutTests/accessibility/display-none-change.html index 7b19112..9697088 100644 --- a/third_party/WebKit/LayoutTests/accessibility/display-none-change.html +++ b/third_party/WebKit/LayoutTests/accessibility/display-none-change.html @@ -11,9 +11,9 @@ test(function(t){ // Get the AXObject for the label indirectly, even though it's display:none. // Ensure that it's valid. - var axLabel = axButton.deprecatedTitleUIElement(); + var axLabel = axButton.nameElementAtIndex(0); assert_equals(axLabel.isValid, true); - assert_equals(axLabel.deprecatedDescription, 'AXDescription: AriaLabel'); + assert_equals(axLabel.name, 'AriaLabel'); // Now un-hide the label. var label = document.getElementById('label'); @@ -21,10 +21,10 @@ test(function(t){ // Ensure that the previous AXObject we had for the label is now invalid, but if // we fetch an AXObject for it, we get a new valid object. - var axLabel2 = axButton.deprecatedTitleUIElement(); + var axLabel2 = axButton.nameElementAtIndex(0); assert_equals(axLabel.isValid, false); assert_equals(axLabel2.isValid, true); - assert_equals(axLabel2.deprecatedDescription, 'AXDescription: AriaLabel'); + assert_equals(axLabel2.name, 'AriaLabel'); assert_equals(axLabel.isEqual(axLabel2), false); // Now hide the label again. @@ -32,11 +32,11 @@ test(function(t){ // Check once more: the second AXObject is now invalid, but if we fetch // an AXObject for the label a third time, we get a valid object again. - var axLabel3 = axButton.deprecatedTitleUIElement(); + var axLabel3 = axButton.nameElementAtIndex(0); assert_equals(axLabel.isValid, false); assert_equals(axLabel2.isValid, false); assert_equals(axLabel3.isValid, true); - assert_equals(axLabel3.deprecatedDescription, 'AXDescription: AriaLabel'); + assert_equals(axLabel3.name, 'AriaLabel'); assert_equals(axLabel.isEqual(axLabel3), false); assert_equals(axLabel2.isEqual(axLabel3), false); }, "Accessibility objects for display:none elements"); diff --git a/third_party/WebKit/LayoutTests/accessibility/dl-role.html b/third_party/WebKit/LayoutTests/accessibility/dl-role.html index 5e0f9df..59d2476 100644 --- a/third_party/WebKit/LayoutTests/accessibility/dl-role.html +++ b/third_party/WebKit/LayoutTests/accessibility/dl-role.html @@ -18,4 +18,4 @@ if (window.accessibilityController) { var ddElement = accessibilityController.accessibleElementById("ddElem"); shouldBe("ddElement.role", "'AXRole: AXDescriptionListDetail'"); } -</script>
\ No newline at end of file +</script> diff --git a/third_party/WebKit/LayoutTests/accessibility/element-role-mapping-normal.html b/third_party/WebKit/LayoutTests/accessibility/element-role-mapping-normal.html index d8b649b..f525dbd 100644 --- a/third_party/WebKit/LayoutTests/accessibility/element-role-mapping-normal.html +++ b/third_party/WebKit/LayoutTests/accessibility/element-role-mapping-normal.html @@ -92,4 +92,4 @@ if (window.testRunner) if (window.accessibilityController) buildAccessibilityTree(accessibilityController.focusedElement, 0, 1); </script> -</html>
\ No newline at end of file +</html> diff --git a/third_party/WebKit/LayoutTests/accessibility/focusable-div-expected.txt b/third_party/WebKit/LayoutTests/accessibility/focusable-div-expected.txt index 8e5c8be..27be1b0 100644 --- a/third_party/WebKit/LayoutTests/accessibility/focusable-div-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/focusable-div-expected.txt @@ -12,23 +12,21 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE PASS document.activeElement == link is true -PASS lastChar(axLink.deprecatedTitle) is "A" +PASS axLink.name is "A" PASS document.activeElement == div is true -PASS lastChar(axDiv.deprecatedTitle) is "B" +PASS axDiv.name is "" PASS document.activeElement == div2 is true -PASS lastChar(axDiv2.deprecatedTitle) is "C" +PASS axDiv2.name is "" PASS document.activeElement == div3 is true -PASS lastChar(axDiv3.deprecatedDescription) is "D" +PASS axDiv3.name is "D" PASS document.activeElement == div4 is true -PASS axDiv4.deprecatedTitle.indexOf('Link') is -1 +PASS axDiv4.name is "" PASS document.activeElement == div5 is true -PASS axDiv5.deprecatedTitle.indexOf('Link') is -1 -PASS axDiv5.deprecatedTitle.indexOf('Initial text before link') >= 0 is true +PASS axDiv5.name is "" PASS document.activeElement == div6 is true -PASS axDiv6.deprecatedTitle.indexOf('List item') is -1 +PASS axDiv6.name is "" PASS document.activeElement == div7 is true -PASS axDiv7.deprecatedTitle.indexOf('List item') is -1 -PASS axDiv7.deprecatedTitle.indexOf('Initial text before list') >= 0 is true +PASS axDiv7.name is "" PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/focusable-div.html b/third_party/WebKit/LayoutTests/accessibility/focusable-div.html index a04be0a..242d0fc 100644 --- a/third_party/WebKit/LayoutTests/accessibility/focusable-div.html +++ b/third_party/WebKit/LayoutTests/accessibility/focusable-div.html @@ -6,12 +6,10 @@ <!-- A link always gets its accessible text from contents. --> <a id="link" href="#">A</a> -<!-- A generic focusable div should also get its accessible text from contents. --> +<!-- A generic focusable div not get its accessible text from contents. --> <div id="div" tabindex="0">B</div> <div id="div2" tabindex="0"><div></div>C</div> <div id="div3" tabindex="0" aria-label="D"></div> - -<!-- A generic focusable div should not get accessible text from children that are focusable or containers. --> <div id="div4" tabindex="0"><a href="#">Link</a></div> <div id="div5" tabindex="0">Initial text before link<a href="#">Link</a></div> <div id="div6" tabindex="0"><ul><li>List item</li></ul></div> @@ -24,59 +22,53 @@ description("This test makes sure that a generic focusable div can get accessibi if (window.testRunner && window.accessibilityController) { window.testRunner.dumpAsText(); - function lastChar(str) { - return str.substr(str.length - 1); - } - var link = document.getElementById('link'); link.focus(); shouldBe("document.activeElement == link", "true"); window.axLink = accessibilityController.focusedElement; - shouldBe("lastChar(axLink.deprecatedTitle)", "\"A\""); + shouldBe("axLink.name", "\"A\""); var div = document.getElementById('div'); div.focus(); shouldBe("document.activeElement == div", "true"); window.axDiv = accessibilityController.focusedElement; - shouldBe("lastChar(axDiv.deprecatedTitle)", "\"B\""); + shouldBe("axDiv.name", "\"\""); var div2 = document.getElementById('div2'); div2.focus(); shouldBe("document.activeElement == div2", "true"); window.axDiv2 = accessibilityController.focusedElement; - shouldBe("lastChar(axDiv2.deprecatedTitle)", "\"C\""); + shouldBe("axDiv2.name", "\"\""); var div3 = document.getElementById('div3'); div3.focus(); shouldBe("document.activeElement == div3", "true"); window.axDiv3 = accessibilityController.focusedElement; - shouldBe("lastChar(axDiv3.deprecatedDescription)", "\"D\""); + shouldBe("axDiv3.name", "\"D\""); var div4 = document.getElementById('div4'); div4.focus(); shouldBe("document.activeElement == div4", "true"); window.axDiv4 = accessibilityController.focusedElement; - shouldBe("axDiv4.deprecatedTitle.indexOf('Link')", "-1"); + shouldBe("axDiv4.name", "\"\""); var div5 = document.getElementById('div5'); div5.focus(); shouldBe("document.activeElement == div5", "true"); window.axDiv5 = accessibilityController.focusedElement; - shouldBe("axDiv5.deprecatedTitle.indexOf('Link')", "-1"); - shouldBe("axDiv5.deprecatedTitle.indexOf('Initial text before link') >= 0", "true"); + shouldBe("axDiv5.name", "\"\""); var div6 = document.getElementById('div6'); div6.focus(); shouldBe("document.activeElement == div6", "true"); window.axDiv6 = accessibilityController.focusedElement; - shouldBe("axDiv6.deprecatedTitle.indexOf('List item')", "-1"); + shouldBe("axDiv6.name", "\"\""); var div7 = document.getElementById('div7'); div7.focus(); shouldBe("document.activeElement == div7", "true"); window.axDiv7 = accessibilityController.focusedElement; - shouldBe("axDiv7.deprecatedTitle.indexOf('List item')", "-1"); - shouldBe("axDiv7.deprecatedTitle.indexOf('Initial text before list') >= 0", "true"); + shouldBe("axDiv7.name", "\"\""); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/heading-level.html b/third_party/WebKit/LayoutTests/accessibility/heading-level.html index 44ad362..7566eaa 100644 --- a/third_party/WebKit/LayoutTests/accessibility/heading-level.html +++ b/third_party/WebKit/LayoutTests/accessibility/heading-level.html @@ -62,4 +62,4 @@ if (window.testRunner && window.accessibilityController) { } </script> </body> -</html>
\ No newline at end of file +</html> diff --git a/third_party/WebKit/LayoutTests/accessibility/image-link-expected.txt b/third_party/WebKit/LayoutTests/accessibility/image-link-expected.txt index 931dbbb..ad12b2d 100644 --- a/third_party/WebKit/LayoutTests/accessibility/image-link-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/image-link-expected.txt @@ -3,13 +3,11 @@ Image link in the presence of inline continuations This test checks that the right accessibility tree is generated for a link inside an image -AXTitle: Delicious cake +Delicious cake AXRole: AXLink -AXDescription: Child 0: -AXTitle: +Delicious cake AXRole: AXImage -AXDescription: Delicious cake diff --git a/third_party/WebKit/LayoutTests/accessibility/image-map-title-causes-crash.html b/third_party/WebKit/LayoutTests/accessibility/image-map-title-causes-crash.html index 7eb404f..127345b 100644 --- a/third_party/WebKit/LayoutTests/accessibility/image-map-title-causes-crash.html +++ b/third_party/WebKit/LayoutTests/accessibility/image-map-title-causes-crash.html @@ -8,7 +8,7 @@ } function queryTitleOnDecendants(accessibilityObject) { - accessibilityObject.deprecatedTitle + accessibilityObject.name var count = accessibilityObject.childrenCount; for (var i = 0; i < count; ++i) diff --git a/third_party/WebKit/LayoutTests/accessibility/image-map1-expected.txt b/third_party/WebKit/LayoutTests/accessibility/image-map1-expected.txt index 6d22ddc..27aa4fd 100644 --- a/third_party/WebKit/LayoutTests/accessibility/image-map1-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/image-map1-expected.txt @@ -4,12 +4,12 @@ This tests that you can reach the links within an image map. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS body.childAtIndex(3).role is 'AXRole: AXLink' -PASS body.childAtIndex(3).deprecatedTitle is 'AXTitle: Link1' -PASS body.childAtIndex(4).role is 'AXRole: AXLink' -PASS body.childAtIndex(4).deprecatedTitle is 'AXTitle: Link2' -PASS body.childAtIndex(5).role is 'AXRole: AXLink' -PASS body.childAtIndex(5).deprecatedTitle is 'AXTitle: Link3' +PASS body.childAtIndex(0).role is 'AXRole: AXLink' +PASS body.childAtIndex(0).name is 'Link1' +PASS body.childAtIndex(1).role is 'AXRole: AXLink' +PASS body.childAtIndex(1).name is 'Link2' +PASS body.childAtIndex(2).role is 'AXRole: AXLink' +PASS body.childAtIndex(2).name is 'Link3' PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/image-map1.html b/third_party/WebKit/LayoutTests/accessibility/image-map1.html index 8159bbd..b19498b 100644 --- a/third_party/WebKit/LayoutTests/accessibility/image-map1.html +++ b/third_party/WebKit/LayoutTests/accessibility/image-map1.html @@ -7,7 +7,7 @@ testRunner.dumpAsText(); </script> <body id="body"> - + <!-- Test image map --> <map id="apple" name="imagemap1"> <area shape="rect" coords="10,10,133,72" href="http://www.apple.com" title="Link1" /> @@ -20,7 +20,7 @@ <p id="description"></p> <div id="console"></div> - + <script> description("This tests that you can reach the links within an image map."); @@ -28,14 +28,14 @@ document.getElementById("body").focus(); var body = accessibilityController.focusedElement; - shouldBe("body.childAtIndex(3).role", "'AXRole: AXLink'"); - shouldBe("body.childAtIndex(3).deprecatedTitle", "'AXTitle: Link1'"); + shouldBe("body.childAtIndex(0).role", "'AXRole: AXLink'"); + shouldBe("body.childAtIndex(0).name", "'Link1'"); - shouldBe("body.childAtIndex(4).role", "'AXRole: AXLink'"); - shouldBe("body.childAtIndex(4).deprecatedTitle", "'AXTitle: Link2'"); + shouldBe("body.childAtIndex(1).role", "'AXRole: AXLink'"); + shouldBe("body.childAtIndex(1).name", "'Link2'"); - shouldBe("body.childAtIndex(5).role", "'AXRole: AXLink'"); - shouldBe("body.childAtIndex(5).deprecatedTitle", "'AXTitle: Link3'"); + shouldBe("body.childAtIndex(2).role", "'AXRole: AXLink'"); + shouldBe("body.childAtIndex(2).name", "'Link3'"); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/image-map2-expected.txt b/third_party/WebKit/LayoutTests/accessibility/image-map2-expected.txt index 229a206..475c87f 100644 --- a/third_party/WebKit/LayoutTests/accessibility/image-map2-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/image-map2-expected.txt @@ -2,24 +2,13 @@ Image map - test 2 - 2 Links (alt tags) ---------------------- ------------ -AXTitle: + AXRole: AXDiv -AXDescription: ------------- -AXTitle: -AXRole: AXLink -AXDescription: ------------- -AXTitle: -AXRole: AXLink -AXDescription: ------------ -AXTitle: +Link1 AXRole: AXLink -AXDescription: Link1 ------------ -AXTitle: +Link2 AXRole: AXLink -AXDescription: Link2 diff --git a/third_party/WebKit/LayoutTests/accessibility/image-map2.html b/third_party/WebKit/LayoutTests/accessibility/image-map2.html index 6922396..dff9001 100644 --- a/third_party/WebKit/LayoutTests/accessibility/image-map2.html +++ b/third_party/WebKit/LayoutTests/accessibility/image-map2.html @@ -4,9 +4,9 @@ testRunner.dumpAsText(); </script> <body id="body"> - + <div id="result"></div> - + <!-- Test image map --> <map id="apple" name="imagemap1"> <area shape="rect" coords="10,10,133,72" href="http://www.apple.com" alt="Link1" /> @@ -15,7 +15,7 @@ <img src="resources/cake.png" border="0" align="left" usemap="#imagemap1" vspace="1"> - + <script> if (window.accessibilityController) { var result = document.getElementById("result"); @@ -24,7 +24,7 @@ body.focus(); result.innerText += "Image map - test 2 - 2 Links (alt tags)\n"; result.innerText += "----------------------\n"; - result.innerText += accessibilityController.focusedElement.attributesOfChildren() + "\n\n"; + result.innerText += accessibilityController.focusedElement.attributesOfChildren() + "\n\n"; } </script> </body> diff --git a/third_party/WebKit/LayoutTests/accessibility/img-alt-tag-only-whitespace-expected.txt b/third_party/WebKit/LayoutTests/accessibility/img-alt-tag-only-whitespace-expected.txt index 90e8b15..fbd2c8b 100644 --- a/third_party/WebKit/LayoutTests/accessibility/img-alt-tag-only-whitespace-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/img-alt-tag-only-whitespace-expected.txt @@ -1,4 +1,4 @@ -CONSOLE MESSAGE: line 26: Image description: AXDescription: Image +CONSOLE MESSAGE: line 26: Image description: Image diff --git a/third_party/WebKit/LayoutTests/accessibility/img-alt-tag-only-whitespace.html b/third_party/WebKit/LayoutTests/accessibility/img-alt-tag-only-whitespace.html index 444839a..5a57e28 100644 --- a/third_party/WebKit/LayoutTests/accessibility/img-alt-tag-only-whitespace.html +++ b/third_party/WebKit/LayoutTests/accessibility/img-alt-tag-only-whitespace.html @@ -23,7 +23,7 @@ document.getElementById("images").focus(); var imagesGroup = accessibilityController.focusedElement; shouldBe("imagesGroup.childrenCount", "4"); - console.log("Image description: " + imagesGroup.childAtIndex(2).deprecatedDescription); + console.log("Image description: " + imagesGroup.childAtIndex(2).name); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/img-aria-button-alt-tag-expected.txt b/third_party/WebKit/LayoutTests/accessibility/img-aria-button-alt-tag-expected.txt index c784910..8b31f9d 100644 --- a/third_party/WebKit/LayoutTests/accessibility/img-aria-button-alt-tag-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/img-aria-button-alt-tag-expected.txt @@ -4,7 +4,7 @@ This test makes sure that a img acting as an aria button still returns its alt t On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS imgUIElement.deprecatedDescription is 'AXDescription: alternate' +PASS imgUIElement.name is 'alternate' PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/img-aria-button-alt-tag.html b/third_party/WebKit/LayoutTests/accessibility/img-aria-button-alt-tag.html index 5812bcf..1b3ee43 100644 --- a/third_party/WebKit/LayoutTests/accessibility/img-aria-button-alt-tag.html +++ b/third_party/WebKit/LayoutTests/accessibility/img-aria-button-alt-tag.html @@ -21,7 +21,7 @@ var body = document.getElementById("body").focus(); var imgUIElement = accessibilityController.focusedElement.childAtIndex(0).childAtIndex(0); - shouldBe("imgUIElement.deprecatedDescription", "'AXDescription: alternate'"); + shouldBe("imgUIElement.name", "'alternate'"); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/img-fallsback-to-title-expected.txt b/third_party/WebKit/LayoutTests/accessibility/img-fallsback-to-title-expected.txt index 35be43f..8c79554 100644 --- a/third_party/WebKit/LayoutTests/accessibility/img-fallsback-to-title-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/img-fallsback-to-title-expected.txt @@ -6,17 +6,17 @@ This tests that images will fallback to using the title attribute if no other de On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -Image1 description: AXDescription: test1 -Image1 help: AXHelp: +Image1 name: test1 +Image1 description: -Image2 description: AXDescription: alt -Image2 help: AXHelp: test2 +Image2 name: alt +Image2 description: test2 -Image3 description: AXDescription: test3 -Image3 help: AXHelp: +Image3 name: test3 +Image3 description: -Image4 description: AXDescription: alt -Image4 help: AXHelp: test4 +Image4 name: test4 +Image4 description: PASS imagesGroup.childAtIndex(0).childrenCount is 2 PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/accessibility/img-fallsback-to-title.html b/third_party/WebKit/LayoutTests/accessibility/img-fallsback-to-title.html index 1de678f..932957a 100644 --- a/third_party/WebKit/LayoutTests/accessibility/img-fallsback-to-title.html +++ b/third_party/WebKit/LayoutTests/accessibility/img-fallsback-to-title.html @@ -26,26 +26,26 @@ var imagesGroup = accessibilityController.focusedElement; // First image should have a description of "test1" because there is no alt tag (it should use the title). - // The title should NOT be in the help text. + // The title should NOT be in the description. var image1 = imagesGroup.childAtIndex(0).childAtIndex(0); - debug("Image1 description: " + image1.deprecatedDescription); - debug("Image1 help: " + image1.deprecatedHelpText + "<br>"); + debug("Image1 name: " + image1.name); + debug("Image1 description: " + image1.description + "<br>"); - // Second image should use the description from the alt tag instead of the title. - // The help text should reflect what's in the title. + // Second image should use the alt tag instead of the title. + // The description should reflect what's in the title. var image2 = imagesGroup.childAtIndex(0).childAtIndex(1); - debug("Image2 description: " + image2.deprecatedDescription); - debug("Image2 help: " + image2.deprecatedHelpText + "<br>"); + debug("Image2 name: " + image2.name); + debug("Image2 description: " + image2.description + "<br>"); // Now do the same checks for ARIA type images. var image3 = imagesGroup.childAtIndex(1); - debug("Image3 description: " + image3.deprecatedDescription); - debug("Image3 help: " + image3.deprecatedHelpText + "<br>"); + debug("Image3 name: " + image3.name); + debug("Image3 description: " + image3.description + "<br>"); // Now do the same checks for ARIA type images. var image4 = imagesGroup.childAtIndex(2); - debug("Image4 description: " + image4.deprecatedDescription); - debug("Image4 help: " + image4.deprecatedHelpText + "<br>"); + debug("Image4 name: " + image4.name); + debug("Image4 description: " + image4.description + "<br>"); // Verify that the first image (with an empty alt tag) is ignored // by checking the children count of the group containing the native images == 2. diff --git a/third_party/WebKit/LayoutTests/accessibility/input-file-causes-crash.html b/third_party/WebKit/LayoutTests/accessibility/input-file-causes-crash.html index 370eb92..7c8e0fd 100644 --- a/third_party/WebKit/LayoutTests/accessibility/input-file-causes-crash.html +++ b/third_party/WebKit/LayoutTests/accessibility/input-file-causes-crash.html @@ -17,7 +17,7 @@ if (window.accessibilityController) { document.getElementById("file-input").focus(); var element = accessibilityController.focusedElement; - var title = element.deprecatedTitle; + var title = element.name; shouldBeNonNull("title"); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/input-image-alt-expected.txt b/third_party/WebKit/LayoutTests/accessibility/input-image-alt-expected.txt index 60a9963..b3360a5 100644 --- a/third_party/WebKit/LayoutTests/accessibility/input-image-alt-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/input-image-alt-expected.txt @@ -4,7 +4,7 @@ This test makes sure that an input image returns its alt tag as the description On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS img.deprecatedDescription is 'AXDescription: Submit' +PASS img.name is 'Submit' PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/input-image-alt.html b/third_party/WebKit/LayoutTests/accessibility/input-image-alt.html index 28a2031..4e6cb3f 100644 --- a/third_party/WebKit/LayoutTests/accessibility/input-image-alt.html +++ b/third_party/WebKit/LayoutTests/accessibility/input-image-alt.html @@ -17,7 +17,7 @@ var image1 = document.getElementById("image1").focus(); var img = accessibilityController.focusedElement; - shouldBe("img.deprecatedDescription", "'AXDescription: Submit'"); + shouldBe("img.name", "'Submit'"); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/legend.html b/third_party/WebKit/LayoutTests/accessibility/legend.html index b377517..4d46fdf 100644 --- a/third_party/WebKit/LayoutTests/accessibility/legend.html +++ b/third_party/WebKit/LayoutTests/accessibility/legend.html @@ -24,7 +24,7 @@ document.body.focus(); var body = accessibilityController.focusedElement; var fieldset = body.childAtIndex(0); - var titleUIElement = fieldset.deprecatedTitleUIElement(); + var titleUIElement = fieldset.nameElementAtIndex(0); // Print out the tree of accessible objects, indicating the titleUIElement so // that each platform can verify their expected object has been found diff --git a/third_party/WebKit/LayoutTests/accessibility/link-inside-button-accessible-text-expected.txt b/third_party/WebKit/LayoutTests/accessibility/link-inside-button-accessible-text-expected.txt index ef72e01..00bb111 100644 --- a/third_party/WebKit/LayoutTests/accessibility/link-inside-button-accessible-text-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/link-inside-button-accessible-text-expected.txt @@ -3,8 +3,8 @@ This tests that when a link is inside a button, its visible text is still availa On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS button1.deprecatedTitle is 'AXTitle: foo1' -PASS button2.deprecatedTitle is 'AXTitle: foo2' +PASS button1.name is 'foo1' +PASS button2.name is 'foo2' PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/link-inside-button-accessible-text.html b/third_party/WebKit/LayoutTests/accessibility/link-inside-button-accessible-text.html index 27d94cd..2fe4f7c 100644 --- a/third_party/WebKit/LayoutTests/accessibility/link-inside-button-accessible-text.html +++ b/third_party/WebKit/LayoutTests/accessibility/link-inside-button-accessible-text.html @@ -20,9 +20,9 @@ description("This tests that when a link is inside a button, its visible text is still available for the button."); if (window.accessibilityController) { var button1 = accessibilityController.accessibleElementById("button1"); - shouldBe("button1.deprecatedTitle", "'AXTitle: foo1'"); + shouldBe("button1.name", "'foo1'"); var button2 = accessibilityController.accessibleElementById("button2"); - shouldBe("button2.deprecatedTitle", "'AXTitle: foo2'"); + shouldBe("button2.name", "'foo2'"); document.getElementById("content").style.visibility = 'hidden'; } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/loading-iframe-sends-notification.html b/third_party/WebKit/LayoutTests/accessibility/loading-iframe-sends-notification.html index 5dec56bc..2a3262b 100644 --- a/third_party/WebKit/LayoutTests/accessibility/loading-iframe-sends-notification.html +++ b/third_party/WebKit/LayoutTests/accessibility/loading-iframe-sends-notification.html @@ -37,7 +37,7 @@ // Ignore this notification if it's not within the subtree of the iframe. var frameTarget = target.parentElement().parentElement(); - if (frameTarget.deprecatedDescription.indexOf("InnerFrame") == -1) + if (frameTarget.name.indexOf("InnerFrame") == -1) return; // Even still we'll get LayoutComplete notifications sooner than we want. diff --git a/third_party/WebKit/LayoutTests/accessibility/meter-value.html b/third_party/WebKit/LayoutTests/accessibility/meter-value.html index 91be52033..ac6cecc 100644 --- a/third_party/WebKit/LayoutTests/accessibility/meter-value.html +++ b/third_party/WebKit/LayoutTests/accessibility/meter-value.html @@ -21,4 +21,4 @@ if (window.accessibilityController) { shouldBe("axMeter1.intValue", "5"); } </script> -</body>
\ No newline at end of file +</body> diff --git a/third_party/WebKit/LayoutTests/accessibility/non-data-table-cell-title-ui-element.html b/third_party/WebKit/LayoutTests/accessibility/non-data-table-cell-title-ui-element.html index 1fdc9a9..8562ac8 100644 --- a/third_party/WebKit/LayoutTests/accessibility/non-data-table-cell-title-ui-element.html +++ b/third_party/WebKit/LayoutTests/accessibility/non-data-table-cell-title-ui-element.html @@ -31,7 +31,7 @@ body.focus(); // get the <th>skip</th> element var group = accessibilityController.focusedElement.childAtIndex(5); - var titleUI = group.deprecatedTitleUIElement(); + var titleUI = group.nameElementAtIndex(0); var allAttributes = ""; if (titleUI) allAttributes = titleUI.allAttributes(); diff --git a/third_party/WebKit/LayoutTests/accessibility/radio-button-title-label-expected.txt b/third_party/WebKit/LayoutTests/accessibility/radio-button-title-label-expected.txt index fac2f2c..dc250f6 100644 --- a/third_party/WebKit/LayoutTests/accessibility/radio-button-title-label-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/radio-button-title-label-expected.txt @@ -3,14 +3,14 @@ This test checks that radio buttons expose title ui elements correctly under a v On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS focusedElement.deprecatedTitle is 'AXTitle: LABEL' -PASS !titleUIElement || titleUIElement.deprecatedTitle == 'AXTitle: ' is true -PASS focusedElement.deprecatedDescription is 'AXDescription: LABEL2a' -PASS focusedElement.deprecatedTitle is 'AXTitle: ' -PASS !titleUIElement || titleUIElement.deprecatedTitle == 'AXTitle: ' is true -PASS focusedElement.deprecatedDescription is 'AXDescription: radio3' -PASS focusedElement.deprecatedTitle is 'AXTitle: ' -PASS !titleUIElement || titleUIElement.deprecatedTitle == 'AXTitle: ' is true +PASS focusedElement.name is 'LABEL' +PASS !titleUIElement || titleUIElement.name == '' is true +PASS focusedElement.name is 'LABEL2a' +PASS focusedElement.description is '' +PASS !titleUIElement || titleUIElement.name == '' is true +PASS focusedElement.name is 'radio3' +PASS focusedElement.description is '' +PASS !titleUIElement || titleUIElement.name == '' is true PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/radio-button-title-label.html b/third_party/WebKit/LayoutTests/accessibility/radio-button-title-label.html index a01582f..f4de4d1 100644 --- a/third_party/WebKit/LayoutTests/accessibility/radio-button-title-label.html +++ b/third_party/WebKit/LayoutTests/accessibility/radio-button-title-label.html @@ -10,7 +10,7 @@ <p id="description"></p> <div id="console"></div> - + <input type="radio" name="r1" id="r1" title="TITLE">Test<br> <label for="r1">LABEL</label> @@ -32,25 +32,25 @@ // 1) Even though a checkbox has a title attribute, the title ui element should still be exposed. var focusedElement = accessibilityController.focusedElement; - var titleUIElement = focusedElement.deprecatedTitleUIElement(); - shouldBe("focusedElement.deprecatedTitle", "'AXTitle: LABEL'"); - shouldBeTrue("!titleUIElement || titleUIElement.deprecatedTitle == 'AXTitle: '"); + var titleUIElement = focusedElement.nameElementAtIndex(0); + shouldBe("focusedElement.name", "'LABEL'"); + shouldBeTrue("!titleUIElement || titleUIElement.name == ''"); // 2) aria-labeledby should override the native label semantics and return a title for the radio button, instead of a title ui element. document.getElementById("r2").focus(); focusedElement = accessibilityController.focusedElement; - titleUIElement = focusedElement.deprecatedTitleUIElement(); - shouldBe("focusedElement.deprecatedDescription", "'AXDescription: LABEL2a'"); - shouldBe("focusedElement.deprecatedTitle", "'AXTitle: '"); - shouldBeTrue("!titleUIElement || titleUIElement.deprecatedTitle == 'AXTitle: '"); + titleUIElement = focusedElement.nameElementAtIndex(0); + shouldBe("focusedElement.name", "'LABEL2a'"); + shouldBe("focusedElement.description", "''"); + shouldBeTrue("!titleUIElement || titleUIElement.name == ''"); // 3) If a radio button has an aria-label and a <label>, the aria-label should be the title. document.getElementById("r3").focus(); focusedElement = accessibilityController.focusedElement; - titleUIElement = focusedElement.deprecatedTitleUIElement(); - shouldBe("focusedElement.deprecatedDescription", "'AXDescription: radio3'"); - shouldBe("focusedElement.deprecatedTitle", "'AXTitle: '"); - shouldBeTrue("!titleUIElement || titleUIElement.deprecatedTitle == 'AXTitle: '"); + titleUIElement = focusedElement.nameElementAtIndex(0); + shouldBe("focusedElement.name", "'radio3'"); + shouldBe("focusedElement.description", "''"); + shouldBeTrue("!titleUIElement || titleUIElement.name == ''"); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/role-attribute.html b/third_party/WebKit/LayoutTests/accessibility/role-attribute.html index 839c5a8..d8c51f7 100644 --- a/third_party/WebKit/LayoutTests/accessibility/role-attribute.html +++ b/third_party/WebKit/LayoutTests/accessibility/role-attribute.html @@ -32,4 +32,4 @@ if (window.testRunner) testRunner.dumpAsText(); if (window.accessibilityController) buildAccessibilityTree(accessibilityController.focusedElement, 0, 1); -</script>
\ No newline at end of file +</script> diff --git a/third_party/WebKit/LayoutTests/accessibility/secure-textfield-title-ui.html b/third_party/WebKit/LayoutTests/accessibility/secure-textfield-title-ui.html index fba35b5..38514b1 100644 --- a/third_party/WebKit/LayoutTests/accessibility/secure-textfield-title-ui.html +++ b/third_party/WebKit/LayoutTests/accessibility/secure-textfield-title-ui.html @@ -19,7 +19,7 @@ var pass = document.getElementById("accountpassword"); pass.focus(); - var titleUIElement = accessibilityController.focusedElement.deprecatedTitleUIElement(); + var titleUIElement = accessibilityController.focusedElement.nameElementAtIndex(0); var titleText = titleUIElement.childAtIndex(0); if (titleText.stringValue == "AXValue: Password") { result.innerText += "Test passed\n"; diff --git a/third_party/WebKit/LayoutTests/accessibility/spinbutton-value-expected.txt b/third_party/WebKit/LayoutTests/accessibility/spinbutton-value-expected.txt index 7727e42..3644944 100644 --- a/third_party/WebKit/LayoutTests/accessibility/spinbutton-value-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/spinbutton-value-expected.txt @@ -9,7 +9,7 @@ PASS endsWith(axSpin.intValue, '5') is true PASS endsWith(axSpin.minValue, '1') is true PASS endsWith(axSpin.maxValue, '9') is true PASS endsWith(axSpin.valueDescription, '5 of 9') is true -PASS axSpin.deprecatedTitle is axUntitled.deprecatedTitle +PASS axSpin.name is axUntitled.name PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/spinbutton-value.html b/third_party/WebKit/LayoutTests/accessibility/spinbutton-value.html index 1e61300..2a1c06b 100644 --- a/third_party/WebKit/LayoutTests/accessibility/spinbutton-value.html +++ b/third_party/WebKit/LayoutTests/accessibility/spinbutton-value.html @@ -41,7 +41,7 @@ if (window.testRunner && window.accessibilityController) { // Make sure the title doesn't come from the inner text. It should just be empty if // not otherwise specified. - shouldBe("axSpin.deprecatedTitle", "axUntitled.deprecatedTitle"); + shouldBe("axSpin.name", "axUntitled.name"); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/svg-bounds-expected.txt b/third_party/WebKit/LayoutTests/accessibility/svg-bounds-expected.txt index bd777aa..f3e5831 100644 --- a/third_party/WebKit/LayoutTests/accessibility/svg-bounds-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/svg-bounds-expected.txt @@ -6,25 +6,25 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE container location: (607, 107) Face role: AXRole: AXButton -Face label: AXDescription: face +Face label: face FaceX: 0 FaceY: 0 Eye role: AXRole: AXButton -Eye label: AXDescription: left-eye +Eye label: left-eye EyeX: 103 EyeY: 148 Nose role: AXRole: AXButton -Nose label: AXDescription: nose +Nose label: nose NoseX: 193 NoseY: 206 Mouth role: AXRole: AXButton -Mouth label: AXDescription: smile +Mouth label: smile MouthX: 114 MouthY: 274 @@ -35,7 +35,7 @@ TextY/10: 11 Image role: AXRole: AXImage -Image label: AXDescription: Test Image +Image label: Test Image ImageX: 21 ImageY: 21 PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/accessibility/svg-bounds.html b/third_party/WebKit/LayoutTests/accessibility/svg-bounds.html index d99acda..236cbe1 100644 --- a/third_party/WebKit/LayoutTests/accessibility/svg-bounds.html +++ b/third_party/WebKit/LayoutTests/accessibility/svg-bounds.html @@ -46,28 +46,28 @@ if (window.testRunner && window.accessibilityController) { var face = container.childAtIndex(0); debug('Face role: ' + face.role); - debug('Face label: ' + face.deprecatedDescription); + debug('Face label: ' + face.name); debug('FaceX: ' + (pageX(face) - x)); debug('FaceY: ' + Math.abs(pageY(face) - y)); debug('<br>'); var eye = container.childAtIndex(1); debug('Eye role: ' + eye.role); - debug('Eye label: ' + eye.deprecatedDescription); + debug('Eye label: ' + eye.name); debug('EyeX: ' + (pageX(eye) - x)); debug('EyeY: ' + Math.abs(pageY(eye) - y)); debug('<br>'); var nose = container.childAtIndex(3); debug('Nose role: ' + nose.role); - debug('Nose label: ' + nose.deprecatedDescription); + debug('Nose label: ' + nose.name); debug('NoseX: ' + (pageX(nose) - x)); debug('NoseY: ' + Math.abs(pageY(nose) - y)); debug('<br>'); var mouth = container.childAtIndex(4); debug('Mouth role: ' + mouth.role); - debug('Mouth label: ' + mouth.deprecatedDescription); + debug('Mouth label: ' + mouth.name); debug('MouthX: ' + (pageX(mouth) - x)); debug('MouthY: ' + Math.floor(Math.abs(pageY(mouth) - y))); debug('<br>'); @@ -82,7 +82,7 @@ if (window.testRunner && window.accessibilityController) { var image = container.childAtIndex(6); debug('Image role: ' + image.role); - debug('Image label: ' + image.deprecatedDescription); + debug('Image label: ' + image.name); debug('ImageX: ' + (pageX(image) - x)); debug('ImageY: ' + Math.abs(pageY(image) - y)); } diff --git a/third_party/WebKit/LayoutTests/accessibility/svg-image-expected.txt b/third_party/WebKit/LayoutTests/accessibility/svg-image-expected.txt index a3187d2..f04856e 100644 --- a/third_party/WebKit/LayoutTests/accessibility/svg-image-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/svg-image-expected.txt @@ -5,9 +5,9 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE PASS svgImage.role is realImage.role -PASS svgImage.deprecatedDescription is realImage.deprecatedDescription +PASS svgImage.name is realImage.name SVG Image Role: AXRole: AXImage -SVG Image Description: AXDescription: TestImage +SVG Image Description: TestImage PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/svg-image.html b/third_party/WebKit/LayoutTests/accessibility/svg-image.html index c3581a9..f94755c 100644 --- a/third_party/WebKit/LayoutTests/accessibility/svg-image.html +++ b/third_party/WebKit/LayoutTests/accessibility/svg-image.html @@ -27,10 +27,10 @@ document.getElementById("svgimage").focus(); var svgImage = accessibilityController.focusedElement; shouldBe("svgImage.role", "realImage.role"); - shouldBe("svgImage.deprecatedDescription", "realImage.deprecatedDescription"); + shouldBe("svgImage.name", "realImage.name"); debug("SVG Image Role: " + svgImage.role); - debug("SVG Image Description: " + svgImage.deprecatedDescription); + debug("SVG Image Description: " + svgImage.name); } </script> diff --git a/third_party/WebKit/LayoutTests/accessibility/table-cell-spans-expected.txt b/third_party/WebKit/LayoutTests/accessibility/table-cell-spans-expected.txt index 775d4be..782a57c 100644 --- a/third_party/WebKit/LayoutTests/accessibility/table-cell-spans-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/table-cell-spans-expected.txt @@ -8,37 +8,32 @@ ROWSPAN="2" 3,2 3,3 3,4 4,2 4,3 4,4 ---------------------- { 0, 0 } -AXTitle: + AXRole: AXCell -AXDescription: {0, 2}, {0, 2} ---------------------- { 1, 1 } -AXTitle: + AXRole: AXCell -AXDescription: {0, 2}, {0, 2} ---------------------- { 3, 0 } -AXTitle: + AXRole: AXCell -AXDescription: {2, 2}, {0, 1} ---------------------- { 2, 0 } -AXTitle: + AXRole: AXCell -AXDescription: {2, 2}, {0, 1} ---------------------- { 2, 3 } -AXTitle: + AXRole: AXCell -AXDescription: {2, 1}, {3, 1} ---------------------- diff --git a/third_party/WebKit/LayoutTests/accessibility/table-cells-expected.txt b/third_party/WebKit/LayoutTests/accessibility/table-cells-expected.txt index 16996e9..cdfe6e9 100644 --- a/third_party/WebKit/LayoutTests/accessibility/table-cells-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/table-cells-expected.txt @@ -10,29 +10,24 @@ South 3333 1111 2222 South 3333 1111 2222 ------------------------ [0,0] -AXTitle: + AXRole: AXColumnHeader -AXDescription: ------------------------ [3,1] -AXTitle: + AXRole: AXColumnHeader -AXDescription: ------------------------ [1,1] -AXTitle: + AXRole: AXColumnHeader -AXDescription: ------------------------ [2,2] -AXTitle: + AXRole: AXCell -AXDescription: ------------------------ [3,5] -AXTitle: + AXRole: AXCell -AXDescription: ------------------------ [100,0] diff --git a/third_party/WebKit/LayoutTests/accessibility/table-detection-expected.txt b/third_party/WebKit/LayoutTests/accessibility/table-detection-expected.txt index bb91a28..1520799 100644 --- a/third_party/WebKit/LayoutTests/accessibility/table-detection-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/table-detection-expected.txt @@ -1,99 +1,87 @@ This should be a table because it has a thead. -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf asdf asdf This should be a table because cells have borders. -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf This should not be a table because its cells do not have borders. -AXTitle: + AXRole: AXGroup -AXDescription: asdf asdf This should be a table because a cell has a special attribute -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf This should be a table because a cell has a special attribute. -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf This should be a table because a cell has a special attribute. -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf asdf asdf This should be a table because cells have different colors. -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf This should not be a table because cells have different but no spacing. -AXTitle: + AXRole: AXGroup -AXDescription: asdf asdf This should not be a table because cells have the same colors even though there is spacing. -AXTitle: + AXRole: AXGroup -AXDescription: asdf asdf This should be a table because it has the "rules" attr. -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf This should not be a table because it only has one valid cell (need more than one). -AXTitle: + AXRole: AXGroup -AXDescription: Contributions This should not be a table because it does not have enough cell borders or background colors -AXTitle: + AXRole: AXGroup -AXDescription: Politics Decision '08 @@ -105,35 +93,31 @@ New York Times This should be a table because it's editable. -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf This should be a table because most cells have a top border. -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf asdf asdf This should not be a table because cells have different borders. -AXTitle: + AXRole: AXGroup -AXDescription: asdf asdf asdf asdf This should be a table because it sets empty-cells: hide on the table. -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf asdf @@ -141,9 +125,8 @@ asdf asdf This should be a table because it sets empty-cells: hide on a cell. -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf asdf @@ -151,18 +134,16 @@ asdf asdf This should be a table because it has a col. -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf asdf asdf This should be a table because it has at least 20 rows -AXTitle: + AXRole: AXTable -AXDescription: asdf asdf diff --git a/third_party/WebKit/LayoutTests/accessibility/table-one-cell-expected.txt b/third_party/WebKit/LayoutTests/accessibility/table-one-cell-expected.txt index 9b24e45..fb9f9f2c 100644 --- a/third_party/WebKit/LayoutTests/accessibility/table-one-cell-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/table-one-cell-expected.txt @@ -1,6 +1,5 @@ Pick Your Location! Get specific content for your area. http://web.apple.com -AXTitle: + AXRole: AXParagraph -AXDescription: diff --git a/third_party/WebKit/LayoutTests/accessibility/table-with-aria-role-expected.txt b/third_party/WebKit/LayoutTests/accessibility/table-with-aria-role-expected.txt index bb6fea2..155e2a4 100644 --- a/third_party/WebKit/LayoutTests/accessibility/table-with-aria-role-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/table-with-aria-role-expected.txt @@ -4,10 +4,8 @@ test test test test test test ------------ -AXTitle: test test test test test test +test test test test test test AXRole: AXButton -AXDescription: ------------ -AXTitle: + AXRole: AXMenu -AXDescription: diff --git a/third_party/WebKit/LayoutTests/accessibility/table-with-rules-expected.txt b/third_party/WebKit/LayoutTests/accessibility/table-with-rules-expected.txt index a320166..5cdd71b 100644 --- a/third_party/WebKit/LayoutTests/accessibility/table-with-rules-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/table-with-rules-expected.txt @@ -5,24 +5,19 @@ asdf asdf asdf asdf ------------------------------------ -AXTitle: + AXRole: AXTable -AXDescription: -AXTitle: + AXRole: AXTable -AXDescription: -AXTitle: + AXRole: AXTable -AXDescription: -AXTitle: + AXRole: AXGroup -AXDescription: -AXTitle: + AXRole: AXGroup -AXDescription: diff --git a/third_party/WebKit/LayoutTests/accessibility/th-as-title-ui-expected.txt b/third_party/WebKit/LayoutTests/accessibility/th-as-title-ui-expected.txt deleted file mode 100644 index dee2dae..0000000 --- a/third_party/WebKit/LayoutTests/accessibility/th-as-title-ui-expected.txt +++ /dev/null @@ -1,3 +0,0 @@ -Header for button -Header for button -Pass diff --git a/third_party/WebKit/LayoutTests/accessibility/th-as-title-ui.html b/third_party/WebKit/LayoutTests/accessibility/th-as-title-ui.html deleted file mode 100644 index 124101e..0000000 --- a/third_party/WebKit/LayoutTests/accessibility/th-as-title-ui.html +++ /dev/null @@ -1,42 +0,0 @@ -<html> -<script> - if (window.testRunner) - testRunner.dumpAsText(); -</script> -<body id="body"> - - <!-- the AXGroup that comes from the <td> should have the <th> as its title ui element - In the 2nd case, it should not have a title ui element --> - - <table width="90" border="0"> - <tr> - <th>Header for button</th> - <td><input type="button" value="button"></td> - </tr> - </table> - - <table width="90" border="0"> - <tr> - <td>Header for button</td> - <td><input type="button" value="button"></td> - </tr> - </table> - - <div id="result"></div> - - <script> - if (window.accessibilityController) { - var result = document.getElementById("result"); - - var body = document.getElementById("body"); - body.focus(); - var group = accessibilityController.focusedElement.childAtIndex(1); - var group2 = accessibilityController.focusedElement.childAtIndex(3); - if (group.deprecatedTitleUIElement().allAttributes() != "" && (group2.deprecatedTitleUIElement() == null || group2.deprecatedTitleUIElement().allAttributes() == "")) - result.innerText += "Pass"; - else - result.innerText += "Fail"; - } - </script> -</body> -</html> diff --git a/third_party/WebKit/LayoutTests/accessibility/title-ui-element-correctness-expected.txt b/third_party/WebKit/LayoutTests/accessibility/title-ui-element-correctness-expected.txt index 964c681..eae10b4 100644 --- a/third_party/WebKit/LayoutTests/accessibility/title-ui-element-correctness-expected.txt +++ b/third_party/WebKit/LayoutTests/accessibility/title-ui-element-correctness-expected.txt @@ -3,20 +3,20 @@ This tests that titleUIElement works correctly even when things change dynamical On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS axElement('control1').deprecatedTitleUIElement().isEqual(axElement('label1')) is true -PASS axElement('control2').deprecatedTitleUIElement().isEqual(axElement('label2')) is true +PASS axElement('control1').nameElementAtIndex(0).isEqual(axElement('label1')) is true +PASS axElement('control2').nameElementAtIndex(0).isEqual(axElement('label2')) is true PASS hasTitleUIElement(axElement('control3')) is false -PASS document.getElementById('label3').setAttribute('for', 'control3'); axElement('control3').deprecatedTitleUIElement().isEqual(axElement('label3')) is true +PASS document.getElementById('label3').setAttribute('for', 'control3'); axElement('control3').nameElementAtIndex(0).isEqual(axElement('label3')) is true PASS var label4Element = createLabelWithIdAndForAttribute('label4', 'control4'); hasTitleUIElement(axElement('control4')) is false PASS document.getElementById('container').appendChild(label4Element); hasTitleUIElement(axElement('control4')) is true -PASS axElement('control4').deprecatedTitleUIElement().isEqual(axElement('label4')) is true +PASS axElement('control4').nameElementAtIndex(0).isEqual(axElement('label4')) is true PASS label4Element.parentElement.removeChild(label4Element); hasTitleUIElement(axElement('control4')) is false PASS hasTitleUIElement(axElement('control5')) is false -PASS reparentNodeIntoContainer(document.getElementById('control5'), document.getElementById('label5')); axElement('control5').deprecatedTitleUIElement() != null is true -PASS axElement('control5').deprecatedTitleUIElement().isEqual(axElement('label5')) is true -PASS axElement('control6').deprecatedTitleUIElement().isEqual(axElement('label6b')) is true -PASS newLabel6Element = createLabelWithIdAndForAttribute('label6a', 'control6'); document.body.insertBefore(newLabel6Element, document.body.firstChild); axElement('control6').deprecatedTitleUIElement().isEqual(axElement('label6a')) is true -PASS document.body.removeChild(newLabel6Element); axElement('control6').deprecatedTitleUIElement().isEqual(axElement('label6b')) is true +PASS reparentNodeIntoContainer(document.getElementById('control5'), document.getElementById('label5')); axElement('control5').nameElementAtIndex(0) != null is true +PASS axElement('control5').nameElementAtIndex(0).isEqual(axElement('label5')) is true +PASS axElement('control6').nameElementAtIndex(0).isEqual(axElement('label6b')) is true +PASS newLabel6Element = createLabelWithIdAndForAttribute('label6a', 'control6'); document.body.insertBefore(newLabel6Element, document.body.firstChild); axElement('control6').nameElementAtIndex(0).isEqual(axElement('label6a')) is true +PASS document.body.removeChild(newLabel6Element); axElement('control6').nameElementAtIndex(0).isEqual(axElement('label6b')) is true PASS successfullyParsed is true TEST COMPLETE diff --git a/third_party/WebKit/LayoutTests/accessibility/title-ui-element-correctness.html b/third_party/WebKit/LayoutTests/accessibility/title-ui-element-correctness.html index 0db9179..c0ebfd7 100644 --- a/third_party/WebKit/LayoutTests/accessibility/title-ui-element-correctness.html +++ b/third_party/WebKit/LayoutTests/accessibility/title-ui-element-correctness.html @@ -49,7 +49,7 @@ if (window.testRunner && window.accessibilityController) { function hasTitleUIElement(axElement) { var label1 = accessibilityController.accessibleElementById("label1"); - var titleUIElement = axElement.deprecatedTitleUIElement(); + var titleUIElement = axElement.nameElementAtIndex(0); if (titleUIElement == null) return false; return titleUIElement.role == label1.role; @@ -72,13 +72,13 @@ if (window.testRunner && window.accessibilityController) { return accessibilityController.accessibleElementById(id); } - shouldBe("axElement('control1').deprecatedTitleUIElement().isEqual(axElement('label1'))", "true"); + shouldBe("axElement('control1').nameElementAtIndex(0).isEqual(axElement('label1'))", "true"); - shouldBe("axElement('control2').deprecatedTitleUIElement().isEqual(axElement('label2'))", "true"); + shouldBe("axElement('control2').nameElementAtIndex(0).isEqual(axElement('label2'))", "true"); // Test changing the "for" attribute dynamically. shouldBe("hasTitleUIElement(axElement('control3'))", "false"); - shouldBe("document.getElementById('label3').setAttribute('for', 'control3'); axElement('control3').deprecatedTitleUIElement().isEqual(axElement('label3'))", "true"); + shouldBe("document.getElementById('label3').setAttribute('for', 'control3'); axElement('control3').nameElementAtIndex(0).isEqual(axElement('label3'))", "true"); // Test unattached label element that's subsequently attached. var label4Element = document.createElement("label"); @@ -87,7 +87,7 @@ if (window.testRunner && window.accessibilityController) { label4Element.innerText = "Label 4"; shouldBe("var label4Element = createLabelWithIdAndForAttribute('label4', 'control4'); hasTitleUIElement(axElement('control4'))", "false"); shouldBe("document.getElementById('container').appendChild(label4Element); hasTitleUIElement(axElement('control4'))", "true"); - shouldBe("axElement('control4').deprecatedTitleUIElement().isEqual(axElement('label4'))", "true"); + shouldBe("axElement('control4').nameElementAtIndex(0).isEqual(axElement('label4'))", "true"); // Test what happens when the label is detached. shouldBe("label4Element.parentElement.removeChild(label4Element); hasTitleUIElement(axElement('control4'))", "false"); @@ -95,13 +95,13 @@ if (window.testRunner && window.accessibilityController) { // Test label that gets a control reparented into it. shouldBe("hasTitleUIElement(axElement('control5'))", "false"); - shouldBe("reparentNodeIntoContainer(document.getElementById('control5'), document.getElementById('label5')); axElement('control5').deprecatedTitleUIElement() != null", "true"); - shouldBe("axElement('control5').deprecatedTitleUIElement().isEqual(axElement('label5'))", "true"); + shouldBe("reparentNodeIntoContainer(document.getElementById('control5'), document.getElementById('label5')); axElement('control5').nameElementAtIndex(0) != null", "true"); + shouldBe("axElement('control5').nameElementAtIndex(0).isEqual(axElement('label5'))", "true"); // Make sure the first label is returned, even as labels are added and removed. - shouldBe("axElement('control6').deprecatedTitleUIElement().isEqual(axElement('label6b'))", "true"); - shouldBe("newLabel6Element = createLabelWithIdAndForAttribute('label6a', 'control6'); document.body.insertBefore(newLabel6Element, document.body.firstChild); axElement('control6').deprecatedTitleUIElement().isEqual(axElement('label6a'))", "true"); - shouldBe("document.body.removeChild(newLabel6Element); axElement('control6').deprecatedTitleUIElement().isEqual(axElement('label6b'))", "true"); + shouldBe("axElement('control6').nameElementAtIndex(0).isEqual(axElement('label6b'))", "true"); + shouldBe("newLabel6Element = createLabelWithIdAndForAttribute('label6a', 'control6'); document.body.insertBefore(newLabel6Element, document.body.firstChild); axElement('control6').nameElementAtIndex(0).isEqual(axElement('label6a'))", "true"); + shouldBe("document.body.removeChild(newLabel6Element); axElement('control6').nameElementAtIndex(0).isEqual(axElement('label6b'))", "true"); document.getElementById('container').style.display = 'none'; } diff --git a/third_party/WebKit/LayoutTests/accessibility/whitespace-in-name-calc.html b/third_party/WebKit/LayoutTests/accessibility/whitespace-in-name-calc.html index 11fd349..f014542 100644 --- a/third_party/WebKit/LayoutTests/accessibility/whitespace-in-name-calc.html +++ b/third_party/WebKit/LayoutTests/accessibility/whitespace-in-name-calc.html @@ -42,7 +42,7 @@ if (window.testRunner && window.accessibilityController) { function accessibleTitle(id) { var axObject = accessibilityController.accessibleElementById(id); - return axObject.deprecatedTitle.replace('AXTitle: ', ''); + return axObject.name.replace('', ''); } shouldBe('accessibleTitle("n1")', '"HelloWorld"'); diff --git a/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/date-picker-ax-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/date-picker-ax-expected.txt index 22f28d5..f17477c 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/date-picker-ax-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/date-picker-ax-expected.txt @@ -3,23 +3,23 @@ Tests if typing an arrow key dispatches |Focus| and |ActiveDescendantChanged| a1 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -Focused: AXDescription: -Focused: AXDescription: -Focused: AXDescription: Sunday January 2 2000 +Focused: +Focused: +Focused: Sunday January 2 2000 PASS Received ActiveDescendantChanged -Focused: AXDescription: Monday January 3 2000 +Focused: Monday January 3 2000 PASS Received ActiveDescendantChanged -Focused: AXDescription: Show next month -Focused: AXDescription: <<CalendarToday>> -Focused: AXDescription: Show previous month -Focused: AXDescription: Show month selection panel +Focused: Show next month +Focused: <<CalendarToday>> +Focused: Show previous month +Focused: Show month selection panel Open the month popup. This should notify the third ActiveDescendantChanged. -Focused: AXDescription: -Focused: AXDescription: January 2000 +Focused: +Focused: January 2000 PASS Received ActiveDescendantChanged -Focused: AXDescription: February 2000 +Focused: February 2000 PASS Received ActiveDescendantChanged -Focused: AXDescription: October 1999 +Focused: October 1999 PASS Received ActiveDescendantChanged PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/date-picker-ax.html b/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/date-picker-ax.html index a7c0e59..b5aad16 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/date-picker-ax.html +++ b/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/date-picker-ax.html @@ -14,7 +14,7 @@ description('Tests if typing an arrow key dispatches |Focus| and |ActiveDescenda window.accessibilityController.setNotificationListener(function(axnode, type) { if (type == 'Focus') { // Remove ',' to reduce platform differences. - debug('Focused: ' + escapeHTML(accessibilityController.focusedElement.deprecatedDescription.replace(/,/g, ''))); + debug('Focused: ' + escapeHTML(accessibilityController.focusedElement.name.replace(/,/g, ''))); } else if (type == 'ActiveDescendantChanged') { testPassed('Received ActiveDescendantChanged'); if (++activeDescendantCounter == 2) { diff --git a/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/month-picker-ax-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/month-picker-ax-expected.txt index 3cf911a..82c9a9b 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/month-picker-ax-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/month-picker-ax-expected.txt @@ -3,11 +3,11 @@ Tests if typing an arrow key dispatches |Focus| and |ActiveDescendantChanged| a1 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -Focused: AXDescription: -Focused: AXDescription: -Focused: AXDescription: January 2000 +Focused: +Focused: +Focused: January 2000 PASS Received ActiveDescendantChanged -Focused: AXDescription: February 2000 +Focused: February 2000 PASS Received ActiveDescendantChanged PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/month-picker-ax.html b/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/month-picker-ax.html index b38a17b..1b64492 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/month-picker-ax.html +++ b/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/month-picker-ax.html @@ -14,7 +14,7 @@ description('Tests if typing an arrow key dispatches |Focus| and |ActiveDescenda window.accessibilityController.setNotificationListener(function(axnode, type) { if (type == 'Focus') { // Remove ',' to reduce platform differences. - debug('Focused: ' + escapeHTML(accessibilityController.focusedElement.deprecatedDescription.replace(/,/g, ''))); + debug('Focused: ' + escapeHTML(accessibilityController.focusedElement.name.replace(/,/g, ''))); } else if (type == 'ActiveDescendantChanged') { testPassed('Received ActiveDescendantChanged'); if (++activeDescendantCounter == 2) diff --git a/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/week-picker-ax-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/week-picker-ax-expected.txt index 43a4b50..82c9f5d 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/week-picker-ax-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/week-picker-ax-expected.txt @@ -3,11 +3,11 @@ Tests if typing an arrow key dispatches |Focus| and |ActiveDescendantChanged| a1 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -Focused: AXDescription: -Focused: AXDescription: -Focused: AXDescription: Week 13 2000 starting on Monday March 27 2000 +Focused: +Focused: +Focused: Week 13 2000 starting on Monday March 27 2000 PASS Received ActiveDescendantChanged -Focused: AXDescription: Week 14 2000 starting on Monday April 3 2000 +Focused: Week 14 2000 starting on Monday April 3 2000 PASS Received ActiveDescendantChanged PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/week-picker-ax.html b/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/week-picker-ax.html index 3dcfee0..dd13df7 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/week-picker-ax.html +++ b/third_party/WebKit/LayoutTests/fast/forms/calendar-picker/week-picker-ax.html @@ -14,7 +14,7 @@ description('Tests if typing an arrow key dispatches |Focus| and |ActiveDescenda window.accessibilityController.setNotificationListener(function(axnode, type) { if (type == 'Focus') { // Remove ',' to reduce platform differences. - debug('Focused: ' + escapeHTML(accessibilityController.focusedElement.deprecatedDescription.replace(/,/g, ''))); + debug('Focused: ' + escapeHTML(accessibilityController.focusedElement.name.replace(/,/g, ''))); } else if (type == 'ActiveDescendantChanged') { testPassed('Received ActiveDescendantChanged'); if (++activeDescendantCounter == 2) diff --git a/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes-expected.txt index e3e2de3..d6eef08 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes-expected.txt @@ -4,17 +4,17 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE Initial empty state -PASS focusedElementDescription() is "AXHelp: Month, AXValueDescription: blank, intValue:0, range:1-12" -PASS focusedElementDescription() is "AXHelp: Day, AXValueDescription: blank, intValue:0, range:1-31" -PASS focusedElementDescription() is "AXHelp: Year, AXValueDescription: blank, intValue:0, range:1-275760" +PASS focusedElementDescription() is "Month, AXValueDescription: blank, intValue:0, range:1-12" +PASS focusedElementDescription() is "Day, AXValueDescription: blank, intValue:0, range:1-31" +PASS focusedElementDescription() is "Year, AXValueDescription: blank, intValue:0, range:1-275760" Non-empty value -PASS focusedElementDescription() is "AXHelp: Month, AXValueDescription: 10, intValue:10, range:1-12" -PASS focusedElementDescription() is "AXHelp: Day, AXValueDescription: 09, intValue:9, range:1-31" -PASS focusedElementDescription() is "AXHelp: Year, AXValueDescription: 2012, intValue:2012, range:1-275760" +PASS focusedElementDescription() is "Month, AXValueDescription: 10, intValue:10, range:1-12" +PASS focusedElementDescription() is "Day, AXValueDescription: 09, intValue:9, range:1-31" +PASS focusedElementDescription() is "Year, AXValueDescription: 2012, intValue:2012, range:1-275760" Empty value -PASS focusedElementDescription() is "AXHelp: Year, AXValueDescription: blank, intValue:0, range:1-275760" -PASS focusedElementDescription() is "AXHelp: Day, AXValueDescription: blank, intValue:0, range:1-31" -PASS focusedElementDescription() is "AXHelp: Month, AXValueDescription: blank, intValue:0, range:1-12" +PASS focusedElementDescription() is "Year, AXValueDescription: blank, intValue:0, range:1-275760" +PASS focusedElementDescription() is "Day, AXValueDescription: blank, intValue:0, range:1-31" +PASS focusedElementDescription() is "Month, AXValueDescription: blank, intValue:0, range:1-12" PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes.html b/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes.html index 22efaeb..4fd07a5 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes.html +++ b/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-aria-attributes.html @@ -16,31 +16,31 @@ if (!window.accessibilityController || !window.eventSender) else { testInput.focus(); debug('Initial empty state'); - checkFocusedElementAXAttributes('AXHelp: Month, AXValueDescription: blank, intValue:0, range:1-12'); + checkFocusedElementAXAttributes('Month, AXValueDescription: blank, intValue:0, range:1-12'); eventSender.keyDown('\t'); - checkFocusedElementAXAttributes('AXHelp: Day, AXValueDescription: blank, intValue:0, range:1-31'); + checkFocusedElementAXAttributes('Day, AXValueDescription: blank, intValue:0, range:1-31'); eventSender.keyDown('\t'); - checkFocusedElementAXAttributes('AXHelp: Year, AXValueDescription: blank, intValue:0, range:1-275760'); + checkFocusedElementAXAttributes('Year, AXValueDescription: blank, intValue:0, range:1-275760'); eventSender.keyDown('\t', ['shiftKey']); eventSender.keyDown('\t', ['shiftKey']); debug('Non-empty value'); testInput.value = "2012-10-09"; - checkFocusedElementAXAttributes('AXHelp: Month, AXValueDescription: 10, intValue:10, range:1-12'); + checkFocusedElementAXAttributes('Month, AXValueDescription: 10, intValue:10, range:1-12'); eventSender.keyDown('\t'); - checkFocusedElementAXAttributes('AXHelp: Day, AXValueDescription: 09, intValue:9, range:1-31'); + checkFocusedElementAXAttributes('Day, AXValueDescription: 09, intValue:9, range:1-31'); eventSender.keyDown('\t'); - checkFocusedElementAXAttributes('AXHelp: Year, AXValueDescription: 2012, intValue:2012, range:1-275760'); + checkFocusedElementAXAttributes('Year, AXValueDescription: 2012, intValue:2012, range:1-275760'); debug('Empty value'); eventSender.keyDown('\b'); - checkFocusedElementAXAttributes('AXHelp: Year, AXValueDescription: blank, intValue:0, range:1-275760'); + checkFocusedElementAXAttributes('Year, AXValueDescription: blank, intValue:0, range:1-275760'); eventSender.keyDown('\t', ['shiftKey']); eventSender.keyDown('\b'); - checkFocusedElementAXAttributes('AXHelp: Day, AXValueDescription: blank, intValue:0, range:1-31'); + checkFocusedElementAXAttributes('Day, AXValueDescription: blank, intValue:0, range:1-31'); eventSender.keyDown('\t', ['shiftKey']); eventSender.keyDown('\b'); - checkFocusedElementAXAttributes('AXHelp: Month, AXValueDescription: blank, intValue:0, range:1-12'); + checkFocusedElementAXAttributes('Month, AXValueDescription: blank, intValue:0, range:1-12'); debug(''); testInput.parentNode.removeChild(testInput); diff --git a/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-value-changed-notification-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-value-changed-notification-expected.txt index 5666f5d..011158e 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-value-changed-notification-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-value-changed-notification-expected.txt @@ -3,13 +3,13 @@ This test checks value changed accessibility notifications. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -Focus AXHelp: Month=AXValueDescription: 10 -Focus AXHelp: Day=AXValueDescription: 09 -Focus AXHelp: Year=AXValueDescription: 2012 -ValueChanged AXHelp: Day=AXValueDescription: 04 -ValueChanged AXHelp: Day=AXValueDescription: 04 -ValueChanged AXHelp: Year=AXValueDescription: 2013 -ValueChanged AXHelp: Year=AXValueDescription: 2013 +Focus Month=AXValueDescription: 10 +Focus Day=AXValueDescription: 09 +Focus Year=AXValueDescription: 2012 +ValueChanged Day=AXValueDescription: 04 +ValueChanged Day=AXValueDescription: 04 +ValueChanged Year=AXValueDescription: 2013 +ValueChanged Year=AXValueDescription: 2013 PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-value-changed-notification.html b/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-value-changed-notification.html index 0cb36f3..227b46a 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-value-changed-notification.html +++ b/third_party/WebKit/LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-ax-value-changed-notification.html @@ -15,7 +15,7 @@ if (!window.accessibilityController || !window.eventSender) else { accessibilityController.addNotificationListener(function (element, notification) { if (notification == 'Focus' || notification == 'ValueChanged') { - debug(notification + ' ' + element.deprecatedHelpText + '=' + element.valueDescription); + debug(notification + ' ' + element.description + '=' + element.valueDescription); } }); diff --git a/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes-expected.txt index 5c48f4a..b7f8dfd 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes-expected.txt @@ -4,23 +4,23 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE Non-empty value -PASS focusedFieldValueDescription() is "AXHelp: Month, AXValueDescription: 10, 1, 12" -PASS focusedFieldValueDescription() is "AXHelp: Day, AXValueDescription: 09, 1, 31" -PASS focusedFieldValueDescription() is "AXHelp: Year, AXValueDescription: 2012, 1, 275760" -PASS focusedFieldValueDescription() is "AXHelp: Hours, AXValueDescription: 12, 1, 12" -PASS focusedFieldValueDescription() is "AXHelp: Minutes, AXValueDescription: 34, 0, 59" -PASS focusedFieldValueDescription() is "AXHelp: Seconds, AXValueDescription: 56, 0, 59" -PASS focusedFieldValueDescription() is "AXHelp: Milliseconds, AXValueDescription: 789, 0, 999" -PASS focusedFieldValueDescription() is "AXHelp: AM/PM, AXValueDescription: PM, 1, 2" +PASS focusedFieldValueDescription() is "Month, AXValueDescription: 10, 1, 12" +PASS focusedFieldValueDescription() is "Day, AXValueDescription: 09, 1, 31" +PASS focusedFieldValueDescription() is "Year, AXValueDescription: 2012, 1, 275760" +PASS focusedFieldValueDescription() is "Hours, AXValueDescription: 12, 1, 12" +PASS focusedFieldValueDescription() is "Minutes, AXValueDescription: 34, 0, 59" +PASS focusedFieldValueDescription() is "Seconds, AXValueDescription: 56, 0, 59" +PASS focusedFieldValueDescription() is "Milliseconds, AXValueDescription: 789, 0, 999" +PASS focusedFieldValueDescription() is "AM/PM, AXValueDescription: PM, 1, 2" Empty value -PASS focusedFieldValueDescription() is "AXHelp: AM/PM, AXValueDescription: blank, 1, 2" -PASS focusedFieldValueDescription() is "AXHelp: Milliseconds, AXValueDescription: blank, 0, 999" -PASS focusedFieldValueDescription() is "AXHelp: Seconds, AXValueDescription: blank, 0, 59" -PASS focusedFieldValueDescription() is "AXHelp: Minutes, AXValueDescription: blank, 0, 59" -PASS focusedFieldValueDescription() is "AXHelp: Hours, AXValueDescription: blank, 1, 12" -PASS focusedFieldValueDescription() is "AXHelp: Year, AXValueDescription: blank, 1, 275760" -PASS focusedFieldValueDescription() is "AXHelp: Day, AXValueDescription: blank, 1, 31" -PASS focusedFieldValueDescription() is "AXHelp: Month, AXValueDescription: blank, 1, 12" +PASS focusedFieldValueDescription() is "AM/PM, AXValueDescription: blank, 1, 2" +PASS focusedFieldValueDescription() is "Milliseconds, AXValueDescription: blank, 0, 999" +PASS focusedFieldValueDescription() is "Seconds, AXValueDescription: blank, 0, 59" +PASS focusedFieldValueDescription() is "Minutes, AXValueDescription: blank, 0, 59" +PASS focusedFieldValueDescription() is "Hours, AXValueDescription: blank, 1, 12" +PASS focusedFieldValueDescription() is "Year, AXValueDescription: blank, 1, 275760" +PASS focusedFieldValueDescription() is "Day, AXValueDescription: blank, 1, 31" +PASS focusedFieldValueDescription() is "Month, AXValueDescription: blank, 1, 12" PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes.html b/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes.html index 5e9c0cd..cc69301 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes.html +++ b/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-aria-attributes.html @@ -11,7 +11,7 @@ description('This test checks aria-help attribute of fields in multiple fields d function focusedFieldValueDescription() { var element = accessibilityController.focusedElement; - return element.deprecatedHelpText + ', ' + element.valueDescription + ', ' + element.minValue + ', ' + element.maxValue; + return element.description + ', ' + element.valueDescription + ', ' + element.minValue + ', ' + element.maxValue; } var testInput = document.getElementById('test'); @@ -21,46 +21,46 @@ if (!window.accessibilityController || !window.eventSender) else { debug('Non-empty value'); testInput.focus(); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Month, AXValueDescription: 10, 1, 12'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Month, AXValueDescription: 10, 1, 12'); eventSender.keyDown('\t'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Day, AXValueDescription: 09, 1, 31'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Day, AXValueDescription: 09, 1, 31'); eventSender.keyDown('\t'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Year, AXValueDescription: 2012, 1, 275760'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Year, AXValueDescription: 2012, 1, 275760'); eventSender.keyDown('\t'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Hours, AXValueDescription: 12, 1, 12'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Hours, AXValueDescription: 12, 1, 12'); eventSender.keyDown('\t'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Minutes, AXValueDescription: 34, 0, 59'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Minutes, AXValueDescription: 34, 0, 59'); eventSender.keyDown('\t'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Seconds, AXValueDescription: 56, 0, 59'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Seconds, AXValueDescription: 56, 0, 59'); eventSender.keyDown('\t'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Milliseconds, AXValueDescription: 789, 0, 999'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Milliseconds, AXValueDescription: 789, 0, 999'); eventSender.keyDown('\t'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: AM/PM, AXValueDescription: PM, 1, 2'); + shouldBeEqualToString('focusedFieldValueDescription()', 'AM/PM, AXValueDescription: PM, 1, 2'); debug('Empty value'); eventSender.keyDown('\b'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: AM/PM, AXValueDescription: blank, 1, 2'); + shouldBeEqualToString('focusedFieldValueDescription()', 'AM/PM, AXValueDescription: blank, 1, 2'); eventSender.keyDown('\t', ['shiftKey']); eventSender.keyDown('\b'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Milliseconds, AXValueDescription: blank, 0, 999'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Milliseconds, AXValueDescription: blank, 0, 999'); eventSender.keyDown('\t', ['shiftKey']); eventSender.keyDown('\b'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Seconds, AXValueDescription: blank, 0, 59'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Seconds, AXValueDescription: blank, 0, 59'); eventSender.keyDown('\t', ['shiftKey']); eventSender.keyDown('\b'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Minutes, AXValueDescription: blank, 0, 59'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Minutes, AXValueDescription: blank, 0, 59'); eventSender.keyDown('\t', ['shiftKey']); eventSender.keyDown('\b'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Hours, AXValueDescription: blank, 1, 12'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Hours, AXValueDescription: blank, 1, 12'); eventSender.keyDown('\t', ['shiftKey']); eventSender.keyDown('\b'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Year, AXValueDescription: blank, 1, 275760'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Year, AXValueDescription: blank, 1, 275760'); eventSender.keyDown('\t', ['shiftKey']); eventSender.keyDown('\b'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Day, AXValueDescription: blank, 1, 31'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Day, AXValueDescription: blank, 1, 31'); eventSender.keyDown('\t', ['shiftKey']); eventSender.keyDown('\b'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Month, AXValueDescription: blank, 1, 12'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Month, AXValueDescription: blank, 1, 12'); debug(''); testInput.parentNode.removeChild(testInput); diff --git a/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-value-changed-notification-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-value-changed-notification-expected.txt index 775a2a5..6424c54 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-value-changed-notification-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-value-changed-notification-expected.txt @@ -3,19 +3,19 @@ This test checks value changed accessibility notifications. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -Focus AXHelp: Month=AXValueDescription: 10 -Focus AXHelp: Day=AXValueDescription: 09 -Focus AXHelp: Year=AXValueDescription: 2012 -Focus AXHelp: Hours=AXValueDescription: 12 -Focus AXHelp: Minutes=AXValueDescription: 34 -ValueChanged AXHelp: Day=AXValueDescription: 04 -ValueChanged AXHelp: Day=AXValueDescription: 04 -ValueChanged AXHelp: Year=AXValueDescription: 2013 -ValueChanged AXHelp: Year=AXValueDescription: 2013 -ValueChanged AXHelp: Hours=AXValueDescription: 02 -ValueChanged AXHelp: Hours=AXValueDescription: 02 -ValueChanged AXHelp: Minutes=AXValueDescription: 33 -ValueChanged AXHelp: Minutes=AXValueDescription: 33 +Focus Month=AXValueDescription: 10 +Focus Day=AXValueDescription: 09 +Focus Year=AXValueDescription: 2012 +Focus Hours=AXValueDescription: 12 +Focus Minutes=AXValueDescription: 34 +ValueChanged Day=AXValueDescription: 04 +ValueChanged Day=AXValueDescription: 04 +ValueChanged Year=AXValueDescription: 2013 +ValueChanged Year=AXValueDescription: 2013 +ValueChanged Hours=AXValueDescription: 02 +ValueChanged Hours=AXValueDescription: 02 +ValueChanged Minutes=AXValueDescription: 33 +ValueChanged Minutes=AXValueDescription: 33 PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-value-changed-notification.html b/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-value-changed-notification.html index 3cba922..9b99a01 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-value-changed-notification.html +++ b/third_party/WebKit/LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-ax-value-changed-notification.html @@ -15,7 +15,7 @@ if (!window.accessibilityController || !window.eventSender) else { accessibilityController.addNotificationListener(function (element, notification) { if (notification == 'Focus' || notification == 'ValueChanged') { - debug(notification + ' ' + element.deprecatedHelpText + '=' + element.valueDescription); + debug(notification + ' ' + element.description + '=' + element.valueDescription); } }); diff --git a/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes-expected.txt index 9e58939..a5a4c5e 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes-expected.txt @@ -4,11 +4,11 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE Non-empty value -PASS focusedElementDescription() is "AXHelp: Month, AXValueDescription: October, intValue:10, range:1-12" -PASS focusedElementDescription() is "AXHelp: Year, AXValueDescription: 2012, intValue:2012, range:1-275760" +PASS focusedElementDescription() is "Month, AXValueDescription: October, intValue:10, range:1-12" +PASS focusedElementDescription() is "Year, AXValueDescription: 2012, intValue:2012, range:1-275760" Empty value -PASS focusedElementDescription() is "AXHelp: Year, AXValueDescription: blank, intValue:0, range:1-275760" -PASS focusedElementDescription() is "AXHelp: Month, AXValueDescription: blank, intValue:0, range:1-12" +PASS focusedElementDescription() is "Year, AXValueDescription: blank, intValue:0, range:1-275760" +PASS focusedElementDescription() is "Month, AXValueDescription: blank, intValue:0, range:1-12" PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes.html b/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes.html index 0ac92ca..b947301 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes.html +++ b/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-aria-attributes.html @@ -16,16 +16,16 @@ if (!window.accessibilityController || !window.eventSender) else { debug('Non-empty value'); testInput.focus(); - checkFocusedElementAXAttributes('AXHelp: Month, AXValueDescription: October, intValue:10, range:1-12'); + checkFocusedElementAXAttributes('Month, AXValueDescription: October, intValue:10, range:1-12'); eventSender.keyDown('\t'); - checkFocusedElementAXAttributes('AXHelp: Year, AXValueDescription: 2012, intValue:2012, range:1-275760'); + checkFocusedElementAXAttributes('Year, AXValueDescription: 2012, intValue:2012, range:1-275760'); debug('Empty value'); eventSender.keyDown('\b'); - checkFocusedElementAXAttributes('AXHelp: Year, AXValueDescription: blank, intValue:0, range:1-275760'); + checkFocusedElementAXAttributes('Year, AXValueDescription: blank, intValue:0, range:1-275760'); eventSender.keyDown('\t', ['shiftKey']); eventSender.keyDown('\b'); - checkFocusedElementAXAttributes('AXHelp: Month, AXValueDescription: blank, intValue:0, range:1-12'); + checkFocusedElementAXAttributes('Month, AXValueDescription: blank, intValue:0, range:1-12'); debug(''); testInput.remove(); diff --git a/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-value-changed-notification-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-value-changed-notification-expected.txt index 3926e79..346aee5 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-value-changed-notification-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-value-changed-notification-expected.txt @@ -3,12 +3,12 @@ This test checks value changed accessibility notifications. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -Focus AXHelp: Month=AXValueDescription: October -Focus AXHelp: Year=AXValueDescription: 2012 -ValueChanged AXHelp: Year=AXValueDescription: 0005 -ValueChanged AXHelp: Year=AXValueDescription: 0005 -ValueChanged AXHelp: Year=AXValueDescription: 0005 -ValueChanged AXHelp: Year=AXValueDescription: 0005 +Focus Month=AXValueDescription: October +Focus Year=AXValueDescription: 2012 +ValueChanged Year=AXValueDescription: 0005 +ValueChanged Year=AXValueDescription: 0005 +ValueChanged Year=AXValueDescription: 0005 +ValueChanged Year=AXValueDescription: 0005 PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-value-changed-notification.html b/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-value-changed-notification.html index fab823f..16efb6e 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-value-changed-notification.html +++ b/third_party/WebKit/LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-ax-value-changed-notification.html @@ -15,7 +15,7 @@ if (!window.accessibilityController || !window.eventSender) else { accessibilityController.addNotificationListener(function (element, notification) { if (notification == 'Focus' || notification == 'ValueChanged') { - debug(notification + ' ' + element.deprecatedHelpText + '=' + element.valueDescription); + debug(notification + ' ' + element.description + '=' + element.valueDescription); } }); diff --git a/third_party/WebKit/LayoutTests/fast/forms/resources/multiple-fields-ax-aria-attributes.js b/third_party/WebKit/LayoutTests/fast/forms/resources/multiple-fields-ax-aria-attributes.js index 5c56d3e..f8e2a91d 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/resources/multiple-fields-ax-aria-attributes.js +++ b/third_party/WebKit/LayoutTests/fast/forms/resources/multiple-fields-ax-aria-attributes.js @@ -1,7 +1,7 @@ function focusedElementDescription() { var element = accessibilityController.focusedElement; - return element.deprecatedHelpText + ', ' + element.valueDescription + ', intValue:' + element.intValue + ', range:'+ element.minValue + '-' + element.maxValue; + return element.description + ', ' + element.valueDescription + ', intValue:' + element.intValue + ', range:'+ element.minValue + '-' + element.maxValue; } function checkFocusedElementAXAttributes(expected) { diff --git a/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes-expected.txt index b7b32a2..c501862 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes-expected.txt @@ -4,17 +4,17 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE Non-empty value -PASS focusedElementDescription() is "AXHelp: Hours, AXValueDescription: 12, intValue:12, range:1-12" -PASS focusedElementDescription() is "AXHelp: Minutes, AXValueDescription: 34, intValue:34, range:0-59" -PASS focusedElementDescription() is "AXHelp: Seconds, AXValueDescription: 56, intValue:56, range:0-59" -PASS focusedElementDescription() is "AXHelp: Milliseconds, AXValueDescription: 789, intValue:789, range:0-999" -PASS focusedElementDescription() is "AXHelp: AM/PM, AXValueDescription: PM, intValue:2, range:1-2" +PASS focusedElementDescription() is "Hours, AXValueDescription: 12, intValue:12, range:1-12" +PASS focusedElementDescription() is "Minutes, AXValueDescription: 34, intValue:34, range:0-59" +PASS focusedElementDescription() is "Seconds, AXValueDescription: 56, intValue:56, range:0-59" +PASS focusedElementDescription() is "Milliseconds, AXValueDescription: 789, intValue:789, range:0-999" +PASS focusedElementDescription() is "AM/PM, AXValueDescription: PM, intValue:2, range:1-2" Empty value -PASS focusedElementDescription() is "AXHelp: AM/PM, AXValueDescription: blank, intValue:0, range:1-2" -PASS focusedElementDescription() is "AXHelp: Milliseconds, AXValueDescription: blank, intValue:0, range:0-999" -PASS focusedElementDescription() is "AXHelp: Seconds, AXValueDescription: blank, intValue:0, range:0-59" -PASS focusedElementDescription() is "AXHelp: Minutes, AXValueDescription: blank, intValue:0, range:0-59" -PASS focusedElementDescription() is "AXHelp: Hours, AXValueDescription: blank, intValue:0, range:1-12" +PASS focusedElementDescription() is "AM/PM, AXValueDescription: blank, intValue:0, range:1-2" +PASS focusedElementDescription() is "Milliseconds, AXValueDescription: blank, intValue:0, range:0-999" +PASS focusedElementDescription() is "Seconds, AXValueDescription: blank, intValue:0, range:0-59" +PASS focusedElementDescription() is "Minutes, AXValueDescription: blank, intValue:0, range:0-59" +PASS focusedElementDescription() is "Hours, AXValueDescription: blank, intValue:0, range:1-12" PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes.html b/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes.html index 629842a..fc53951 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes.html +++ b/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-aria-attributes.html @@ -31,31 +31,31 @@ testInput.focus(); debug('Non-empty value'); testInput.focus(); -checkFocusedElementAXAttributes('AXHelp: Hours, AXValueDescription: 12, intValue:12, range:1-12'); +checkFocusedElementAXAttributes('Hours, AXValueDescription: 12, intValue:12, range:1-12'); keyDown('\t'); -checkFocusedElementAXAttributes('AXHelp: Minutes, AXValueDescription: 34, intValue:34, range:0-59'); +checkFocusedElementAXAttributes('Minutes, AXValueDescription: 34, intValue:34, range:0-59'); keyDown('\t'); -checkFocusedElementAXAttributes('AXHelp: Seconds, AXValueDescription: 56, intValue:56, range:0-59'); +checkFocusedElementAXAttributes('Seconds, AXValueDescription: 56, intValue:56, range:0-59'); keyDown('\t'); -checkFocusedElementAXAttributes('AXHelp: Milliseconds, AXValueDescription: 789, intValue:789, range:0-999'); +checkFocusedElementAXAttributes('Milliseconds, AXValueDescription: 789, intValue:789, range:0-999'); keyDown('\t'); -checkFocusedElementAXAttributes('AXHelp: AM/PM, AXValueDescription: PM, intValue:2, range:1-2'); +checkFocusedElementAXAttributes('AM/PM, AXValueDescription: PM, intValue:2, range:1-2'); debug('Empty value'); keyDown('\b'); -checkFocusedElementAXAttributes('AXHelp: AM/PM, AXValueDescription: blank, intValue:0, range:1-2'); +checkFocusedElementAXAttributes('AM/PM, AXValueDescription: blank, intValue:0, range:1-2'); keyDown('\t', ['shiftKey']); keyDown('\b'); -checkFocusedElementAXAttributes('AXHelp: Milliseconds, AXValueDescription: blank, intValue:0, range:0-999'); +checkFocusedElementAXAttributes('Milliseconds, AXValueDescription: blank, intValue:0, range:0-999'); keyDown('\t', ['shiftKey']); keyDown('\b'); -checkFocusedElementAXAttributes('AXHelp: Seconds, AXValueDescription: blank, intValue:0, range:0-59'); +checkFocusedElementAXAttributes('Seconds, AXValueDescription: blank, intValue:0, range:0-59'); keyDown('\t', ['shiftKey']); keyDown('\b'); -checkFocusedElementAXAttributes('AXHelp: Minutes, AXValueDescription: blank, intValue:0, range:0-59'); +checkFocusedElementAXAttributes('Minutes, AXValueDescription: blank, intValue:0, range:0-59'); keyDown('\t', ['shiftKey']); keyDown('\b'); -checkFocusedElementAXAttributes('AXHelp: Hours, AXValueDescription: blank, intValue:0, range:1-12'); +checkFocusedElementAXAttributes('Hours, AXValueDescription: blank, intValue:0, range:1-12'); debug(''); testInput.parentNode.removeChild(testInput); diff --git a/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-value-changed-notification-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-value-changed-notification-expected.txt index da90a6e..2c8451a 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-value-changed-notification-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-value-changed-notification-expected.txt @@ -3,12 +3,12 @@ This test checks value changed accessibility notifications. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -Focus AXHelp: Hours=AXValueDescription: 12 -Focus AXHelp: Minutes=AXValueDescription: 34 -ValueChanged AXHelp: Minutes=AXValueDescription: 05 -ValueChanged AXHelp: Minutes=AXValueDescription: 05 -ValueChanged AXHelp: Minutes=AXValueDescription: 05 -ValueChanged AXHelp: Minutes=AXValueDescription: 05 +Focus Hours=AXValueDescription: 12 +Focus Minutes=AXValueDescription: 34 +ValueChanged Minutes=AXValueDescription: 05 +ValueChanged Minutes=AXValueDescription: 05 +ValueChanged Minutes=AXValueDescription: 05 +ValueChanged Minutes=AXValueDescription: 05 PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-value-changed-notification.html b/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-value-changed-notification.html index c3b9510..0fe3230 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-value-changed-notification.html +++ b/third_party/WebKit/LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-ax-value-changed-notification.html @@ -17,7 +17,7 @@ function enableAccessibility() accessibilityController.addNotificationListener(function (element, notification) { if (notification == 'Focus' || notification == 'ValueChanged') { - debug(notification + ' ' + element.deprecatedHelpText + '=' + element.valueDescription); + debug(notification + ' ' + element.description + '=' + element.valueDescription); } }); } diff --git a/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-aria-attributes-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-aria-attributes-expected.txt index 9d192c3..fbd3a04 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-aria-attributes-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-aria-attributes-expected.txt @@ -4,11 +4,11 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE Non-empty value -PASS focusedFieldValueDescription() is "AXHelp: Week, AXValueDescription: 10, 1, 53" -PASS focusedFieldValueDescription() is "AXHelp: Year, AXValueDescription: 2012, 1, 275760" +PASS focusedFieldValueDescription() is "Week, AXValueDescription: 10, 1, 53" +PASS focusedFieldValueDescription() is "Year, AXValueDescription: 2012, 1, 275760" Empty value -PASS focusedFieldValueDescription() is "AXHelp: Year, AXValueDescription: blank, 1, 275760" -PASS focusedFieldValueDescription() is "AXHelp: Week, AXValueDescription: blank, 1, 53" +PASS focusedFieldValueDescription() is "Year, AXValueDescription: blank, 1, 275760" +PASS focusedFieldValueDescription() is "Week, AXValueDescription: blank, 1, 53" PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-aria-attributes.html b/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-aria-attributes.html index 339c03e..bb829e0 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-aria-attributes.html +++ b/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-aria-attributes.html @@ -11,7 +11,7 @@ description('This test checks aria-help attribute of fields in multiple fields w function focusedFieldValueDescription() { var element = accessibilityController.focusedElement; - return element.deprecatedHelpText + ', ' + element.valueDescription + ', ' + element.minValue + ', ' + element.maxValue; + return element.description + ', ' + element.valueDescription + ', ' + element.minValue + ', ' + element.maxValue; } var testInput = document.getElementById('test'); @@ -21,16 +21,16 @@ if (!window.accessibilityController || !window.eventSender) else { debug('Non-empty value'); testInput.focus(); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Week, AXValueDescription: 10, 1, 53'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Week, AXValueDescription: 10, 1, 53'); eventSender.keyDown('\t'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Year, AXValueDescription: 2012, 1, 275760'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Year, AXValueDescription: 2012, 1, 275760'); debug('Empty value'); eventSender.keyDown('\b'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Year, AXValueDescription: blank, 1, 275760'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Year, AXValueDescription: blank, 1, 275760'); eventSender.keyDown('\t', ['shiftKey']); eventSender.keyDown('\b'); - shouldBeEqualToString('focusedFieldValueDescription()', 'AXHelp: Week, AXValueDescription: blank, 1, 53'); + shouldBeEqualToString('focusedFieldValueDescription()', 'Week, AXValueDescription: blank, 1, 53'); debug(''); testInput.remove(); diff --git a/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-value-changed-notification-expected.txt b/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-value-changed-notification-expected.txt index 4a59bcb..6df1b1b 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-value-changed-notification-expected.txt +++ b/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-value-changed-notification-expected.txt @@ -3,12 +3,12 @@ This test checks value changed accessibility notifications. On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -Focus AXHelp: Week=AXValueDescription: 10 -Focus AXHelp: Year=AXValueDescription: 2012 -ValueChanged AXHelp: Year=AXValueDescription: 0005 -ValueChanged AXHelp: Year=AXValueDescription: 0005 -ValueChanged AXHelp: Year=AXValueDescription: 0005 -ValueChanged AXHelp: Year=AXValueDescription: 0005 +Focus Week=AXValueDescription: 10 +Focus Year=AXValueDescription: 2012 +ValueChanged Year=AXValueDescription: 0005 +ValueChanged Year=AXValueDescription: 0005 +ValueChanged Year=AXValueDescription: 0005 +ValueChanged Year=AXValueDescription: 0005 PASS successfullyParsed is true diff --git a/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-value-changed-notification.html b/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-value-changed-notification.html index 818d2db..ed21915 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-value-changed-notification.html +++ b/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-ax-value-changed-notification.html @@ -15,7 +15,7 @@ if (!window.accessibilityController || !window.eventSender) else { accessibilityController.addNotificationListener(function (element, notification) { if (notification == 'Focus' || notification == 'ValueChanged') { - debug(notification + ' ' + element.deprecatedHelpText + '=' + element.valueDescription); + debug(notification + ' ' + element.description + '=' + element.valueDescription); } }); diff --git a/third_party/WebKit/LayoutTests/platform/linux/accessibility/canvas-fallback-content-labels-expected.txt b/third_party/WebKit/LayoutTests/platform/linux/accessibility/canvas-fallback-content-labels-expected.txt deleted file mode 100644 index fdcd662..0000000 --- a/third_party/WebKit/LayoutTests/platform/linux/accessibility/canvas-fallback-content-labels-expected.txt +++ /dev/null @@ -1,71 +0,0 @@ -Nothing Text Checkbox Radio Slider List Text with label for -This tests that labels and elements with labels in canvas fallback content have the same accessibility properties as those same elements outside of a canvas. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - - -Checking accessibility properties for ids: nothing1, nothing2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: text_label1, text_label2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: text1, text2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: check_label1, check_label2 -PASS axElement1 == null && axElement2 == null is true - -Checking accessibility properties for ids: check1, check2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: radio_label1, radio_label2 -PASS axElement1 == null && axElement2 == null is true - -Checking accessibility properties for ids: radio1, radio2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: slider_label1, slider_label2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: slider1, slider2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: list_label1, list_label2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: list1, list2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: label_for1, label_for2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: text_for1, text_for2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -PASS successfullyParsed is true - -TEST COMPLETE - diff --git a/third_party/WebKit/LayoutTests/platform/win/accessibility/canvas-fallback-content-labels-expected.txt b/third_party/WebKit/LayoutTests/platform/win/accessibility/canvas-fallback-content-labels-expected.txt deleted file mode 100644 index 915882d..0000000 --- a/third_party/WebKit/LayoutTests/platform/win/accessibility/canvas-fallback-content-labels-expected.txt +++ /dev/null @@ -1,71 +0,0 @@ -Nothing Text Checkbox Radio Slider List Text with label for -This tests that labels and elements with labels in canvas fallback content have the same accessibility properties as those same elements outside of a canvas. - -On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". - - -Checking accessibility properties for ids: nothing1, nothing2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: text_label1, text_label2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: text1, text2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: check_label1, check_label2 -PASS axElement1 == null && axElement2 == null is true - -Checking accessibility properties for ids: check1, check2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: radio_label1, radio_label2 -PASS axElement1 == null && axElement2 == null is true - -Checking accessibility properties for ids: radio1, radio2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: slider_label1, slider_label2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: slider1, slider2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: list_label1, list_label2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: list1, list2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: label_for1, label_for2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -Checking accessibility properties for ids: text_for1, text_for2 -PASS axElement2.role is axElement1.role -PASS collapseWhitespace(axElement2.deprecatedTitle) is collapseWhitespace(axElement1.deprecatedTitle) -PASS axElement2.deprecatedTitleUIElement is axElement1.deprecatedTitleUIElement - -PASS successfullyParsed is true - -TEST COMPLETE - diff --git a/third_party/WebKit/Source/devtools/protocol.json b/third_party/WebKit/Source/devtools/protocol.json index 099a0fa..2f9dd72 100644 --- a/third_party/WebKit/Source/devtools/protocol.json +++ b/third_party/WebKit/Source/devtools/protocol.json @@ -5197,7 +5197,7 @@ }, { "id": "AXValueNativeSourceType", "type": "string", - "enum": [ "figcaption", "label", "labelfor", "labelwrapped", "tablecaption", "other" ], + "enum": [ "figcaption", "label", "labelfor", "labelwrapped", "legend", "tablecaption", "other" ], "description": "Enum of possible native property sources (as a subtype of a particular AXValueSourceType)." }, { diff --git a/third_party/WebKit/Source/modules/accessibility/AXImageMapLink.cpp b/third_party/WebKit/Source/modules/accessibility/AXImageMapLink.cpp index 4ad21ce..f222e23 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXImageMapLink.cpp +++ b/third_party/WebKit/Source/modules/accessibility/AXImageMapLink.cpp @@ -29,6 +29,7 @@ #include "config.h" #include "modules/accessibility/AXImageMapLink.h" +#include "core/dom/ElementTraversal.h" #include "modules/accessibility/AXLayoutObject.h" #include "modules/accessibility/AXObjectCacheImpl.h" @@ -36,36 +37,26 @@ namespace blink { using namespace HTMLNames; -AXImageMapLink::AXImageMapLink(AXObjectCacheImpl& axObjectCache) - : AXMockObject(axObjectCache) - , m_areaElement(nullptr) - , m_mapElement(nullptr) +AXImageMapLink::AXImageMapLink(HTMLAreaElement* area, AXObjectCacheImpl& axObjectCache) + : AXNodeObject(area, axObjectCache) { } AXImageMapLink::~AXImageMapLink() { - ASSERT(!m_areaElement); - ASSERT(!m_mapElement); } -void AXImageMapLink::detach() +AXImageMapLink* AXImageMapLink::create(HTMLAreaElement* area, AXObjectCacheImpl& axObjectCache) { - AXMockObject::detach(); - m_areaElement = nullptr; - m_mapElement = nullptr; + return new AXImageMapLink(area, axObjectCache); } -void AXImageMapLink::detachFromParent() +HTMLMapElement* AXImageMapLink::mapElement() const { - AXMockObject::detachFromParent(); - m_areaElement = nullptr; - m_mapElement = nullptr; -} - -AXImageMapLink* AXImageMapLink::create(AXObjectCacheImpl& axObjectCache) -{ - return new AXImageMapLink(axObjectCache); + HTMLAreaElement* area = areaElement(); + if (!area) + return nullptr; + return Traversal<HTMLMapElement>::firstAncestor(*area); } AXObject* AXImageMapLink::computeParent() const @@ -73,17 +64,14 @@ AXObject* AXImageMapLink::computeParent() const if (m_parent) return m_parent; - if (!m_mapElement.get() || !m_mapElement->layoutObject()) - return 0; + if (!mapElement()) + return nullptr; - return axObjectCache().getOrCreate(m_mapElement->layoutObject()); + return axObjectCache().getOrCreate(mapElement()->layoutObject()); } AccessibilityRole AXImageMapLink::roleValue() const { - if (!m_areaElement) - return LinkRole; - const AtomicString& ariaRole = getAttribute(roleAttr); if (!ariaRole.isEmpty()) return AXObject::ariaRoleToWebCoreRole(ariaRole); @@ -91,6 +79,11 @@ AccessibilityRole AXImageMapLink::roleValue() const return LinkRole; } +bool AXImageMapLink::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReasons) const +{ + return accessibilityIsIgnoredByDefault(ignoredReasons); +} + Element* AXImageMapLink::actionElement() const { return anchorElement(); @@ -98,15 +91,15 @@ Element* AXImageMapLink::actionElement() const Element* AXImageMapLink::anchorElement() const { - return m_areaElement.get(); + return node() ? toElement(node()) : nullptr; } KURL AXImageMapLink::url() const { - if (!m_areaElement.get()) + if (!areaElement()) return KURL(); - return m_areaElement->href(); + return areaElement()->href(); } String AXImageMapLink::deprecatedAccessibilityDescription() const @@ -135,26 +128,26 @@ String AXImageMapLink::deprecatedTitle(TextUnderElementMode mode) const LayoutRect AXImageMapLink::elementRect() const { - if (!m_mapElement.get() || !m_areaElement.get()) + HTMLAreaElement* area = areaElement(); + HTMLMapElement* map = mapElement(); + if (!area || !map) return LayoutRect(); LayoutObject* layoutObject; if (m_parent && m_parent->isAXLayoutObject()) layoutObject = toAXLayoutObject(m_parent)->layoutObject(); else - layoutObject = m_mapElement->layoutObject(); + layoutObject = map->layoutObject(); if (!layoutObject) return LayoutRect(); - return m_areaElement->computeRect(layoutObject); + return area->computeRect(layoutObject); } DEFINE_TRACE(AXImageMapLink) { - visitor->trace(m_areaElement); - visitor->trace(m_mapElement); - AXMockObject::trace(visitor); + AXNodeObject::trace(visitor); } } // namespace blink diff --git a/third_party/WebKit/Source/modules/accessibility/AXImageMapLink.h b/third_party/WebKit/Source/modules/accessibility/AXImageMapLink.h index 58d8648..27ac9f4 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXImageMapLink.h +++ b/third_party/WebKit/Source/modules/accessibility/AXImageMapLink.h @@ -31,32 +31,29 @@ #include "core/html/HTMLAreaElement.h" #include "core/html/HTMLMapElement.h" -#include "modules/accessibility/AXMockObject.h" +#include "modules/accessibility/AXNodeObject.h" namespace blink { class AXObjectCacheImpl; -class AXImageMapLink final : public AXMockObject { +class AXImageMapLink final : public AXNodeObject { private: - explicit AXImageMapLink(AXObjectCacheImpl&); + explicit AXImageMapLink(HTMLAreaElement*, AXObjectCacheImpl&); public: - static AXImageMapLink* create(AXObjectCacheImpl&); + static AXImageMapLink* create(HTMLAreaElement*, AXObjectCacheImpl&); ~AXImageMapLink() override; DECLARE_VIRTUAL_TRACE(); - void setHTMLAreaElement(HTMLAreaElement* element) { m_areaElement = element; } - HTMLAreaElement* areaElement() const { return m_areaElement.get(); } + HTMLAreaElement* areaElement() const { return toHTMLAreaElement(node()); } - void setHTMLMapElement(HTMLMapElement* element) { m_mapElement = element; } - HTMLMapElement* mapElement() const { return m_mapElement.get(); } - - Node* node() const override { return m_areaElement.get(); } + HTMLMapElement* mapElement() const; AccessibilityRole roleValue() const override; bool isEnabled() const override { return true; } + bool computeAccessibilityIsIgnored(IgnoredReasons* = nullptr) const override; Element* anchorElement() const override; Element* actionElement() const override; @@ -70,12 +67,6 @@ public: LayoutRect elementRect() const override; private: - RefPtrWillBeMember<HTMLAreaElement> m_areaElement; - RefPtrWillBeMember<HTMLMapElement> m_mapElement; - - void detach() override; - void detachFromParent() override; - bool isImageMapLink() const override { return true; } }; diff --git a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp index fb97ce9..655ecc9 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp +++ b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp @@ -2474,10 +2474,9 @@ void AXLayoutObject::addImageMapChildren() for (HTMLAreaElement& area : Traversal<HTMLAreaElement>::descendantsOf(*map)) { // add an <area> element for this child if it has a link - if (area.isLink()) { - AXImageMapLink* areaObject = toAXImageMapLink(axObjectCache().getOrCreate(ImageMapLinkRole)); - areaObject->setHTMLAreaElement(&area); - areaObject->setHTMLMapElement(map); + AXObject* obj = axObjectCache().getOrCreate(&area); + if (obj) { + AXImageMapLink* areaObject = toAXImageMapLink(obj); areaObject->setParent(this); ASSERT(areaObject->axObjectID() != 0); if (!areaObject->accessibilityIsIgnored()) diff --git a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp index 2dbb8dc..e2103b1 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp +++ b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp @@ -30,6 +30,7 @@ #include "modules/accessibility/AXNodeObject.h" #include "core/InputTypeNames.h" +#include "core/dom/Element.h" #include "core/dom/NodeTraversal.h" #include "core/dom/Text.h" #include "core/dom/shadow/ComposedTreeTraversal.h" @@ -1499,6 +1500,15 @@ String AXNodeObject::stringValue() const if (node->isTextNode()) return deprecatedTextUnderElement(TextUnderElementAll); + return stringValueOfControl(); +} + +String AXNodeObject::stringValueOfControl() const +{ + Node* node = this->node(); + if (!node) + return String(); + if (isHTMLSelectElement(*node)) { HTMLSelectElement& selectElement = toHTMLSelectElement(*node); int selectedIndex = selectElement.selectedIndex(); @@ -1516,10 +1526,15 @@ String AXNodeObject::stringValue() const if (isNativeTextControl()) return text(); - // FIXME: We might need to implement a value here for more types - // FIXME: It would be better not to advertise a value at all for the types for which we don't implement one; - // this would require subclassing or making accessibilityAttributeNames do something other than return a - // single static array. + // Handle other HTML input elements that aren't text controls, like date and time + // controls, by returning the string value, with the exception of checkboxes + // and radio buttons (which would return "on"). + if (isHTMLInputElement(node)) { + HTMLInputElement* input = toHTMLInputElement(node); + if (input->type() != InputTypeNames::checkbox && input->type() != InputTypeNames::radio) + return input->value(); + } + return String(); } @@ -1925,14 +1940,14 @@ String AXNodeObject::textAlternative(bool recursive, bool inAriaLabelledByTraver // Step 2E from: http://www.w3.org/TR/accname-aam-1.1 if (recursive && !inAriaLabelledByTraversal && isControl()) { // No need to set any name source info in a recursive call. - if (roleValue() == TextFieldRole || roleValue() == ComboBoxRole) - return text(); if (isRange()) { const AtomicString& ariaValuetext = getAttribute(aria_valuetextAttr); if (!ariaValuetext.isNull()) return ariaValuetext.string(); return String::number(valueForRange()); } + + return stringValueOfControl(); } // Step 2F / 2G from: http://www.w3.org/TR/accname-aam-1.1 @@ -1946,6 +1961,8 @@ String AXNodeObject::textAlternative(bool recursive, bool inAriaLabelledByTraver Node* node = this->node(); if (node && node->isTextNode()) textAlternative = toText(node)->wholeText(); + else if (isHTMLBRElement(node)) + textAlternative = String("\n"); else textAlternative = textFromDescendants(visited); @@ -1998,6 +2015,10 @@ String AXNodeObject::textFromDescendants(AXObjectSet& visited) const StringBuilder accumulatedText; AXObject* previous = nullptr; for (AXObject* child = firstChild(); child; child = child->nextSibling()) { + // Skip hidden children + if (child->isInertOrAriaHidden()) + continue; + // If we're going between two layoutObjects that are in separate LayoutBoxes, add // whitespace if it wasn't there already. Intuitively if you have // <span>Hello</span><span>World</span>, those are part of the same LayoutBox @@ -2225,6 +2246,9 @@ bool AXNodeObject::canHaveChildren() const if (!node() && !isAXLayoutObject()) return false; + if (node() && isHTMLMapElement(node())) + return false; + // Elements that should not have children switch (roleValue()) { case ImageRole: @@ -2762,8 +2786,8 @@ String AXNodeObject::nativeTextAlternative(AXObjectSet& visited, AXNameFrom& nam return textAlternative; } - // 5.8 img Element - if (isHTMLImageElement(node())) { + // 5.8 img or area Element + if (isHTMLImageElement(node()) || isHTMLAreaElement(node()) || (layoutObject() && layoutObject()->isSVGImage())) { // alt nameFrom = AXNameFromAttribute; if (nameSources) { @@ -2840,6 +2864,39 @@ String AXNodeObject::nativeTextAlternative(AXObjectSet& visited, AXNameFrom& nam return textAlternative; } + // Fieldset / legend. + if (isHTMLFieldSetElement(node())) { + nameFrom = AXNameFromRelatedElement; + if (nameSources) { + nameSources->append(NameSource(*foundTextAlternative)); + nameSources->last().type = nameFrom; + nameSources->last().nativeSource = AXTextFromNativeHTMLLegend; + } + HTMLElement* legend = toHTMLFieldSetElement(node())->legend(); + if (legend) { + AXObject* legendAXObject = axObjectCache().getOrCreate(legend); + // Avoid an infinite loop + if (legendAXObject && !visited.contains(legendAXObject)) { + textAlternative = recursiveTextAlternative(*legendAXObject, false, visited); + + if (relatedObjects) { + localRelatedObjects.append(new NameSourceRelatedObject(legendAXObject, textAlternative)); + *relatedObjects = localRelatedObjects; + localRelatedObjects.clear(); + } + + if (nameSources) { + NameSource& source = nameSources->last(); + source.relatedObjects = *relatedObjects; + source.text = textAlternative; + *foundTextAlternative = true; + } else { + return textAlternative; + } + } + } + } + return textAlternative; } @@ -3019,6 +3076,24 @@ String AXNodeObject::description(AXNameFrom nameFrom, AXDescriptionFrom& descrip } } + // aria-help. + // FIXME: this is not part of the official standard, but it's needed because the built-in date/time controls use it. + descriptionFrom = AXDescriptionFromAttribute; + if (descriptionSources) { + descriptionSources->append(DescriptionSource(foundDescription, aria_helpAttr)); + descriptionSources->last().type = descriptionFrom; + } + const AtomicString& help = getAttribute(aria_helpAttr); + if (!help.isEmpty()) { + description = help; + if (descriptionSources) { + foundDescription = true; + descriptionSources->last().text = description; + } else { + return description; + } + } + descriptionFrom = AXDescriptionFromUninitialized; if (foundDescription) { @@ -3042,4 +3117,4 @@ DEFINE_TRACE(AXNodeObject) AXObject::trace(visitor); } -} // namespace blink +} // namespace blin diff --git a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.h b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.h index 576ab62..0061dbb 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXNodeObject.h +++ b/third_party/WebKit/Source/modules/accessibility/AXNodeObject.h @@ -108,7 +108,7 @@ protected: bool isImage() const final; bool isImageButton() const; bool isInputImage() const final; - bool isLink() const final; + bool isLink() const override; bool isMenu() const final; bool isMenuButton() const final; bool isMeter() const final; @@ -190,7 +190,7 @@ protected: void insertChild(AXObject*, unsigned index); // DOM and Render tree access. - Element* actionElement() const final; + Element* actionElement() const override; Element* anchorElement() const override; Document* document() const override; Node* node() const override { return m_node; } @@ -228,6 +228,7 @@ private: float stepValueForRange() const; AXObject* findChildWithTagName(const HTMLQualifiedName&) const; bool isDescendantOfElementType(const HTMLQualifiedName& tagName) const; + String stringValueOfControl() const; }; DEFINE_AX_OBJECT_TYPE_CASTS(AXNodeObject, isAXNodeObject()); diff --git a/third_party/WebKit/Source/modules/accessibility/AXObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXObject.cpp index 3b68f15..a42851d 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXObject.cpp +++ b/third_party/WebKit/Source/modules/accessibility/AXObject.cpp @@ -36,6 +36,7 @@ #include "core/frame/Settings.h" #include "core/html/HTMLDialogElement.h" #include "core/html/HTMLFrameOwnerElement.h" +#include "core/html/parser/HTMLParserIdioms.h" #include "core/layout/LayoutListItem.h" #include "core/layout/LayoutTheme.h" #include "core/layout/LayoutView.h" @@ -680,6 +681,10 @@ String AXObject::name(AXNameFrom& nameFrom, AXObject::AXObjectVector* nameObject HeapHashSet<Member<const AXObject>> visited; AXRelatedObjectVector relatedObjects; String text = textAlternative(false, false, visited, nameFrom, &relatedObjects, nullptr); + + if (!node() || !isHTMLBRElement(node())) + text = text.simplifyWhiteSpace(isHTMLSpace<UChar>); + if (nameObjects) { nameObjects->clear(); for (size_t i = 0; i < relatedObjects.size(); i++) @@ -693,7 +698,9 @@ String AXObject::name(NameSources* nameSources) const AXObjectSet visited; AXNameFrom tmpNameFrom; AXRelatedObjectVector tmpRelatedObjects; - return textAlternative(false, false, visited, tmpNameFrom, &tmpRelatedObjects, nameSources); + String text = textAlternative(false, false, visited, tmpNameFrom, &tmpRelatedObjects, nameSources); + text = text.simplifyWhiteSpace(isHTMLSpace<UChar>); + return text; } String AXObject::recursiveTextAlternative(const AXObject& axObj, bool inAriaLabelledByTraversal, AXObjectSet& visited) @@ -1462,21 +1469,23 @@ bool AXObject::nameFromContents() const switch (roleValue()) { case ButtonRole: case CheckBoxRole: - case CellRole: - case ColumnHeaderRole: case DirectoryRole: case DisclosureTriangleRole: + case HeadingRole: + case LineBreakRole: case LinkRole: + case ListBoxOptionRole: case ListItemRole: case MenuItemRole: case MenuItemCheckBoxRole: case MenuItemRadioRole: case MenuListOptionRole: case RadioButtonRole: - case RowHeaderRole: case StaticTextRole: case StatusRole: case SwitchRole: + case TabRole: + case ToggleButtonRole: case TreeItemRole: return true; default: diff --git a/third_party/WebKit/Source/modules/accessibility/AXObject.h b/third_party/WebKit/Source/modules/accessibility/AXObject.h index dc5b6a4..d7c86a49 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXObject.h +++ b/third_party/WebKit/Source/modules/accessibility/AXObject.h @@ -335,6 +335,7 @@ enum AXTextFromNativeHTML { AXTextFromNativeHTMLLabel, AXTextFromNativeHTMLLabelFor, AXTextFromNativeHTMLLabelWrapped, + AXTextFromNativeHTMLLegend, AXTextFromNativeHTMLTableCaption, }; diff --git a/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp b/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp index faab5b8..c786f17c 100644 --- a/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp +++ b/third_party/WebKit/Source/modules/accessibility/AXObjectCacheImpl.cpp @@ -231,13 +231,18 @@ AXObject* AXObjectCacheImpl::get(Node* node) if (!node) return 0; - AXID layoutID = node->layoutObject() ? m_layoutObjectMapping.get(node->layoutObject()) : 0; + // Menu list option and HTML area elements are indexed by DOM node, never by layout object. + LayoutObject* layoutObject = node->layoutObject(); + if (isMenuListOption(node) || isHTMLAreaElement(node)) + layoutObject = nullptr; + + AXID layoutID = layoutObject ? m_layoutObjectMapping.get(layoutObject) : 0; ASSERT(!HashTraits<AXID>::isDeletedValue(layoutID)); AXID nodeID = m_nodeObjectMapping.get(node); ASSERT(!HashTraits<AXID>::isDeletedValue(nodeID)); - if (node->layoutObject() && nodeID && !layoutID && !isMenuListOption(node)) { + if (layoutObject && nodeID && !layoutID) { // This can happen if an AXNodeObject is created for a node that's not // laid out, but later something changes and it gets a layoutObject (like if it's // reparented). @@ -338,6 +343,9 @@ AXObject* AXObjectCacheImpl::createFromNode(Node* node) if (isMenuListOption(node)) return AXMenuListOption::create(toHTMLOptionElement(node), *this); + if (isHTMLAreaElement(node)) + return AXImageMapLink::create(toHTMLAreaElement(node), *this); + return AXNodeObject::create(node, *this); } @@ -392,7 +400,9 @@ AXObject* AXObjectCacheImpl::getOrCreate(Node* node) if (AXObject* obj = get(node)) return obj; - if (node->layoutObject()) + // If the node has a layout object, prefer using that as the primary key for the AXObject, + // with the exception of an HTMLAreaElement, which is created based on its node. + if (node->layoutObject() && !isHTMLAreaElement(node)) return getOrCreate(node->layoutObject()); if (!node->parentElement()) @@ -479,9 +489,6 @@ AXObject* AXObjectCacheImpl::getOrCreate(AccessibilityRole role) // will be filled in... switch (role) { - case ImageMapLinkRole: - obj = AXImageMapLink::create(*this); - break; case ColumnRole: obj = AXTableColumn::create(*this); break; diff --git a/third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp b/third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp index 9c85f45..2200acb 100644 --- a/third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp +++ b/third_party/WebKit/Source/modules/accessibility/InspectorTypeBuilderHelper.cpp @@ -214,6 +214,8 @@ AXValueNativeSourceType::Enum nativeSourceType(AXTextFromNativeHTML nativeSource return AXValueNativeSourceType::Labelwrapped; case AXTextFromNativeHTMLTableCaption: return AXValueNativeSourceType::Tablecaption; + case AXTextFromNativeHTMLLegend: + return AXValueNativeSourceType::Legend; default: return AXValueNativeSourceType::Other; } |