diff --git a/content/test/data/accessibility/html/custom-element-hidden-expected-blink.txt b/content/test/data/accessibility/html/custom-element-hidden-expected-blink.txt index f2f68f3dc68e2..9db06e2f2a933 100644 --- a/content/test/data/accessibility/html/custom-element-hidden-expected-blink.txt +++ b/content/test/data/accessibility/html/custom-element-hidden-expected-blink.txt @@ -5,7 +5,4 @@ rootWebArea htmlTag='#document' ++++++genericContainer ignored invisible htmlTag='div' ++++++++genericContainer ignored invisible htmlTag='my-element' ++++++++++genericContainer ignored invisible htmlTag='div' -++++++++++++genericContainer ignored invisible htmlTag='slot' -++++++++++++++genericContainer ignored invisible htmlTag='span' -++++++++++++++++staticText ignored invisible name='Slot contents' -++++++button htmlTag='button' name='Done' \ No newline at end of file +++++++button htmlTag='button' name='Done' diff --git a/content/test/data/accessibility/html/meter-expected-blink.txt b/content/test/data/accessibility/html/meter-expected-blink.txt index 6c2d34a473e00..3396f991a8bbe 100644 --- a/content/test/data/accessibility/html/meter-expected-blink.txt +++ b/content/test/data/accessibility/html/meter-expected-blink.txt @@ -6,5 +6,3 @@ rootWebArea ++++++++++genericContainer ++++++++++++genericContainer ignored ++++++++genericContainer ignored invisible -++++++++++genericContainer ignored invisible -++++++++++++staticText ignored invisible name='2 out of 10' \ No newline at end of file diff --git a/content/test/data/accessibility/html/meter-expected-fuchsia.txt b/content/test/data/accessibility/html/meter-expected-fuchsia.txt index 8a1d030cd6a02..ae7808c7fec69 100644 --- a/content/test/data/accessibility/html/meter-expected-fuchsia.txt +++ b/content/test/data/accessibility/html/meter-expected-fuchsia.txt @@ -5,6 +5,4 @@ UNKNOWN focusable has_input_focus ++++++++UNKNOWN ++++++++++UNKNOWN ++++++++++++UNKNOWN hidden -++++++++UNKNOWN hidden -++++++++++UNKNOWN hidden -++++++++++++STATIC_TEXT hidden label='2 out of 10' +++++++++UNKNOWN hidden \ No newline at end of file diff --git a/content/test/data/accessibility/html/popover-api-expected-blink.txt b/content/test/data/accessibility/html/popover-api-expected-blink.txt index 5b1d263225402..f609289499b1f 100644 --- a/content/test/data/accessibility/html/popover-api-expected-blink.txt +++ b/content/test/data/accessibility/html/popover-api-expected-blink.txt @@ -10,9 +10,6 @@ rootWebArea ++++++++genericContainer ignored invisible ++++++++++staticText ignored invisible name='Listbox role on ul' ++++++details ignored invisible -++++++++genericContainer ignored invisible -++++++++++disclosureTriangle ignored invisible -++++++++++++staticText ignored invisible name='summary/details popover' ++++++button collapsed name='Button pointing to hidden popover' ++++++++staticText name='Button pointing to hidden popover' ++++++++++inlineTextBox name='Button pointing to hidden popover' diff --git a/content/test/data/accessibility/html/selectmenu-expected-blink.txt b/content/test/data/accessibility/html/selectmenu-expected-blink.txt index e542bb45417b3..065b897e003f7 100644 --- a/content/test/data/accessibility/html/selectmenu-expected-blink.txt +++ b/content/test/data/accessibility/html/selectmenu-expected-blink.txt @@ -12,14 +12,10 @@ rootWebArea focusable ++++++++++++++genericContainer ignored ++++++++genericContainer ignored ++++++++++listBox ignored invisible -++++++++++++genericContainer ignored invisible -++++++++++++++listBoxOption focusable ignored invisible -++++++++++++++listBoxOption focusable ignored invisible -++++++++++++++listBoxOption focusable ignored invisible ++++++genericContainer ++++++++genericContainer ignored ++++++++++comboBoxMenuButton collapsed value='Option 1' haspopup=listbox ++++++++++++staticText name='Custom selectmenu button' ++++++++++++++inlineTextBox name='Custom selectmenu button' ++++++++genericContainer ignored -++++++++++listBox ignored invisible \ No newline at end of file +++++++++++listBox ignored invisible diff --git a/content/test/data/accessibility/html/selectmenu-expected-fuchsia.txt b/content/test/data/accessibility/html/selectmenu-expected-fuchsia.txt index 64300cf2491c3..802f8fa70fda9 100644 --- a/content/test/data/accessibility/html/selectmenu-expected-fuchsia.txt +++ b/content/test/data/accessibility/html/selectmenu-expected-fuchsia.txt @@ -12,10 +12,6 @@ UNKNOWN focusable has_input_focus ++++++++++++++UNKNOWN hidden ++++++++UNKNOWN hidden ++++++++++UNKNOWN hidden -++++++++++++UNKNOWN hidden -++++++++++++++UNKNOWN hidden focusable actions='{DEFAULT}' -++++++++++++++UNKNOWN hidden focusable actions='{DEFAULT}' -++++++++++++++UNKNOWN hidden focusable actions='{DEFAULT}' ++++++UNKNOWN ++++++++UNKNOWN hidden ++++++++++UNKNOWN actions='{DEFAULT}' value='Option 1' diff --git a/content/test/data/accessibility/regression/title-in-shadow-expected-blink.txt b/content/test/data/accessibility/regression/title-in-shadow-expected-blink.txt index fd7f44e423266..099b17beb2e75 100644 --- a/content/test/data/accessibility/regression/title-in-shadow-expected-blink.txt +++ b/content/test/data/accessibility/regression/title-in-shadow-expected-blink.txt @@ -6,4 +6,3 @@ rootWebArea name='' ++++++++++genericContainer ++++++++++++genericContainer ignored ++++++++genericContainer ignored invisible -++++++++++genericContainer ignored invisible \ No newline at end of file diff --git a/third_party/blink/renderer/modules/accessibility/ax_node_object.cc b/third_party/blink/renderer/modules/accessibility/ax_node_object.cc index 99c6b2e2373e4..67b1c83b6c61b 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_node_object.cc +++ b/third_party/blink/renderer/modules/accessibility/ax_node_object.cc @@ -3212,9 +3212,18 @@ String AXNodeObject::GetValueForControl() const { if (auto* select_menu = HTMLSelectMenuElement::OwnerSelectMenu(node)) { DCHECK(RuntimeEnabledFeatures::HTMLSelectMenuElementEnabled()); if (HTMLOptionElement* selected = select_menu->selectedOption()) { - if (selected->firstChild()) { - return selected->textContent(); - } + // TODO(accessibility) Because these is irrelevant inside of a size changes. diff --git a/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h b/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h index 062198234e0f3..89529621d02b8 100644 --- a/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h +++ b/third_party/blink/renderer/modules/accessibility/ax_object_cache_impl.h @@ -440,6 +440,7 @@ class MODULES_EXPORT AXObjectCacheImpl static bool IsRelevantPseudoElement(const Node& node); static bool IsRelevantPseudoElementDescendant( const LayoutObject& layout_object); + static bool IsRelevantSlotElement(const HTMLSlotElement& slot); bool HasBeenDisposed() { return has_been_disposed_; }