Bug 1052866 - Handle QI to IAccessibleText for tables. r=MarcoZ, a=RyanVM
authorJames Teh <jteh@mozilla.com>
Mon, 29 Oct 2018 06:36:51 +0000
changeset 500940 52b79f0655cb6bf92c4cd1fffafc617280feacd3
parent 500939 59be666e2781b30954d40ecf5a11543af40b5f95
child 500941 af012e57e9de8ce72133fe5a1f2b8b0362336260
push id1864
push userffxbld-merge
push dateMon, 03 Dec 2018 15:51:40 +0000
treeherdermozilla-release@f040763d99ad [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMarcoZ, RyanVM
bugs1052866
milestone64.0
Bug 1052866 - Handle QI to IAccessibleText for tables. r=MarcoZ, a=RyanVM The first patch inherits from the right classes, but because tables have additional interfaces, QueryInterface is overridden. It had to be updated to also include HyperTextAccessibleWrap. Rows worked correctly because they don't have any specific interfaces and thus don't override QI. They just inherit their QI implementation from their base class. Differential Revision: https://phabricator.services.mozilla.com/D10022
accessible/windows/msaa/ARIAGridAccessibleWrap.cpp
accessible/windows/msaa/HTMLTableAccessibleWrap.cpp
--- a/accessible/windows/msaa/ARIAGridAccessibleWrap.cpp
+++ b/accessible/windows/msaa/ARIAGridAccessibleWrap.cpp
@@ -12,18 +12,19 @@ using namespace mozilla::a11y;
 
 ////////////////////////////////////////////////////////////////////////////////
 // ARIAGridAccessibleWrap
 ////////////////////////////////////////////////////////////////////////////////
 
 NS_IMPL_ISUPPORTS_INHERITED0(ARIAGridAccessibleWrap,
                              ARIAGridAccessible)
 
-IMPL_IUNKNOWN_INHERITED1(ARIAGridAccessibleWrap,
+IMPL_IUNKNOWN_INHERITED2(ARIAGridAccessibleWrap,
                          AccessibleWrap,
+                         HyperTextAccessibleWrap,
                          ia2AccessibleTable)
 
 void
 ARIAGridAccessibleWrap::Shutdown()
 {
   ia2AccessibleTable::mTable = nullptr;
   ARIAGridAccessible::Shutdown();
 }
--- a/accessible/windows/msaa/HTMLTableAccessibleWrap.cpp
+++ b/accessible/windows/msaa/HTMLTableAccessibleWrap.cpp
@@ -11,18 +11,19 @@ using namespace mozilla::a11y;
 
 ////////////////////////////////////////////////////////////////////////////////
 // HTMLTableAccessibleWrap
 ////////////////////////////////////////////////////////////////////////////////
 
 NS_IMPL_ISUPPORTS_INHERITED0(HTMLTableAccessibleWrap,
                              HTMLTableAccessible)
 
-IMPL_IUNKNOWN_INHERITED1(HTMLTableAccessibleWrap,
+IMPL_IUNKNOWN_INHERITED2(HTMLTableAccessibleWrap,
                          AccessibleWrap,
+                         HyperTextAccessibleWrap,
                          ia2AccessibleTable)
 
 void
 HTMLTableAccessibleWrap::Shutdown()
 {
   ia2AccessibleTable::mTable = nullptr;
   HTMLTableAccessible::Shutdown();
 }