Bug 1735970 part 6: Retrieve row/column extent for both local and rem…

…ote cells. r=morgan CachedTableAccessible already knew how to support extents (AKA spans), but it didn't know how to retrieve them yet. Differential Revision: https://phabricator.services.mozilla.com/D141209
dothq · Apr 1, 2022 · 1f562c2 · 1f562c2
1 parent 78f3eb8
commit 1f562c2
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 2 deletions.
diff --git a/accessible/base/CacheConstants.h b/accessible/base/CacheConstants.h
@@ -24,6 +24,7 @@ class CacheDomain {
   static constexpr uint64_t Style = ((uint64_t)0x1) << 9;
   static constexpr uint64_t TransformMatrix = ((uint64_t)0x1) << 10;
   static constexpr uint64_t ScrollPosition = ((uint64_t)0x1) << 11;
+  static constexpr uint64_t Table = ((uint64_t)0x1) << 11;
   static constexpr uint64_t All = ~((uint64_t)0x0);
 };
 

diff --git a/accessible/base/CachedTableAccessible.cpp b/accessible/base/CachedTableAccessible.cpp
@@ -11,6 +11,8 @@
 #include "nsAccUtils.h"
 #include "nsIAccessiblePivot.h"
 #include "Pivot.h"
+#include "RemoteAccessible.h"
+#include "TableCellAccessible.h"
 
 namespace mozilla::a11y {
 
@@ -257,12 +259,42 @@ TableAccessibleBase* CachedTableCellAccessible::Table() const {
 }
 
 uint32_t CachedTableCellAccessible::ColExtent() const {
-  // XXX Implement.
+  if (RemoteAccessible* remoteAcc = mAcc->AsRemote()) {
+    if (remoteAcc->mCachedFields) {
+      if (auto colSpan = remoteAcc->mCachedFields->GetAttribute<int32_t>(
+              nsGkAtoms::colspan)) {
+        return *colSpan;
+      }
+    }
+  } else if (LocalAccessible* localAcc = mAcc->AsLocal()) {
+    // For HTML table cells, we must use the HTMLTableCellAccessible
+    // GetColExtent method rather than using the DOM attributes directly.
+    // This is because of things like rowspan="0" which depend on knowing
+    // about thead, tbody, etc., which is info we don't have in the a11y tree.
+    TableCellAccessible* cell = localAcc->AsTableCell();
+    MOZ_ASSERT(cell);
+    return cell->ColExtent();
+  }
   return 1;
 }
 
 uint32_t CachedTableCellAccessible::RowExtent() const {
-  // XXX Implement.
+  if (RemoteAccessible* remoteAcc = mAcc->AsRemote()) {
+    if (remoteAcc->mCachedFields) {
+      if (auto rowSpan = remoteAcc->mCachedFields->GetAttribute<int32_t>(
+              nsGkAtoms::rowspan)) {
+        return *rowSpan;
+      }
+    }
+  } else if (LocalAccessible* localAcc = mAcc->AsLocal()) {
+    // For HTML table cells, we must use the HTMLTableCellAccessible
+    // GetRowExtent method rather than using the DOM attributes directly.
+    // This is because of things like rowspan="0" which depend on knowing
+    // about thead, tbody, etc., which is info we don't have in the a11y tree.
+    TableCellAccessible* cell = localAcc->AsTableCell();
+    MOZ_ASSERT(cell);
+    return cell->RowExtent();
+  }
   return 1;
 }
 

diff --git a/accessible/generic/LocalAccessible.cpp b/accessible/generic/LocalAccessible.cpp
@@ -3337,6 +3337,27 @@ already_AddRefed<AccAttributes> LocalAccessible::BundleFieldsForCache(
     }
   }
 
+  if (aCacheDomain & CacheDomain::Table) {
+    if (TableCellAccessible* cell = AsTableCell()) {
+      // For HTML table cells, we must use the HTMLTableCellAccessible
+      // GetRow/ColExtent methods rather than using the DOM attributes directly.
+      // This is because of things like rowspan="0" which depend on knowing
+      // about thead, tbody, etc., which is info we don't have in the a11y tree.
+      int32_t value = static_cast<int32_t>(cell->RowExtent());
+      if (value != 1) {
+        fields->SetAttribute(nsGkAtoms::rowspan, value);
+      } else if (aUpdateType == CacheUpdateType::Update) {
+        fields->SetAttribute(nsGkAtoms::rowspan, DeleteEntry());
+      }
+      value = static_cast<int32_t>(cell->ColExtent());
+      if (value != 1) {
+        fields->SetAttribute(nsGkAtoms::colspan, value);
+      } else if (aUpdateType == CacheUpdateType::Update) {
+        fields->SetAttribute(nsGkAtoms::colspan, DeleteEntry());
+      }
+    }
+  }
+
   if (aUpdateType == CacheUpdateType::Initial) {
     // Add fields which never change and thus only need to be included in the
     // initial cache push.

diff --git a/accessible/html/HTMLTableAccessible.cpp b/accessible/html/HTMLTableAccessible.cpp
@@ -10,6 +10,7 @@
 #include "nsAccessibilityService.h"
 #include "nsAccUtils.h"
 #include "AccAttributes.h"
+#include "CacheConstants.h"
 #include "DocAccessible.h"
 #include "LocalAccessible-inl.h"
 #include "nsTextEquivUtils.h"
@@ -151,6 +152,10 @@ void HTMLTableCellAccessible::DOMAttributeChanged(int32_t aNameSpaceID,
     mDoc->FireDelayedEvent(nsIAccessibleEvent::EVENT_OBJECT_ATTRIBUTE_CHANGED,
                            this);
   }
+  if (aAttribute == nsGkAtoms::rowspan || aAttribute == nsGkAtoms::colspan ||
+      aAttribute == nsGkAtoms::headers) {
+    mDoc->QueueCacheUpdate(this, CacheDomain::Table);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////

diff --git a/accessible/ipc/RemoteAccessibleBase.h b/accessible/ipc/RemoteAccessibleBase.h
@@ -339,6 +339,7 @@ class RemoteAccessibleBase : public Accessible, public HyperTextAccessibleBase {
   friend Derived;
   friend DocAccessibleParent;
   friend class xpcAccessible;
+  friend class CachedTableCellAccessible;
 
   nsTArray<Derived*> mChildren;
   DocAccessibleParent* mDoc;