From 9f69f881018ba2ecab40aa0b13e16058575a8ab0 Mon Sep 17 00:00:00 2001 From: James Teh Date: Fri, 8 May 2020 04:28:11 +0000 Subject: [PATCH] Bug 1628415 part 3: Remove XULListboxAccessible::Value. r=MarcoZ This depends on richlistitem's nsIDOMXULSelectControlItemElement::label implementation, which does the wrong thing in several cases. We could make this use a11y name computation, but I can't find any other list box implementation that exposes accessible value on the list box itself, so I don't see any reason to keep this. Differential Revision: https://phabricator.services.mozilla.com/D74372 --- accessible/xul/XULListboxAccessible.cpp | 21 --------------------- accessible/xul/XULListboxAccessible.h | 1 - 2 files changed, 22 deletions(-) diff --git a/accessible/xul/XULListboxAccessible.cpp b/accessible/xul/XULListboxAccessible.cpp index 168cbcb5f6eb..c985f5232e12 100644 --- a/accessible/xul/XULListboxAccessible.cpp +++ b/accessible/xul/XULListboxAccessible.cpp @@ -97,27 +97,6 @@ uint64_t XULListboxAccessible::NativeState() const { return states; } -/** - * Our value is the label of our ( first ) selected child. - */ -void XULListboxAccessible::Value(nsString& aValue) const { - aValue.Truncate(); - - nsCOMPtr select = Elm()->AsXULSelectControl(); - if (select) { - RefPtr element; - select->GetSelectedItem(getter_AddRefs(element)); - - if (element) { - nsCOMPtr selectedItem = - element->AsXULSelectControlItem(); - if (selectedItem) { - selectedItem->GetLabel(aValue); - } - } - } -} - role XULListboxAccessible::NativeRole() const { // A richlistbox is used with the new autocomplete URL bar, and has a parent // popup . diff --git a/accessible/xul/XULListboxAccessible.h b/accessible/xul/XULListboxAccessible.h index 020a2f150657..e9f3a7072153 100644 --- a/accessible/xul/XULListboxAccessible.h +++ b/accessible/xul/XULListboxAccessible.h @@ -76,7 +76,6 @@ class XULListboxAccessible : public XULSelectControlAccessible, virtual Accessible* AsAccessible() override { return this; } // Accessible - virtual void Value(nsString& aValue) const override; virtual TableAccessible* AsTable() override { return this; } virtual a11y::role NativeRole() const override; virtual uint64_t NativeState() const override;