diff -r 000000000000 -r 6474c204b198 accessible/src/generic/ARIAGridAccessible.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/accessible/src/generic/ARIAGridAccessible.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,150 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef MOZILLA_A11Y_ARIAGridAccessible_h_
+#define MOZILLA_A11Y_ARIAGridAccessible_h_
+
+#include "nsIAccessibleTable.h"
+
+#include "HyperTextAccessibleWrap.h"
+#include "TableAccessible.h"
+#include "TableCellAccessible.h"
+#include "xpcAccessibleTable.h"
+#include "xpcAccessibleTableCell.h"
+
+namespace mozilla {
+namespace a11y {
+
+/**
+ * Accessible for ARIA grid and treegrid.
+ */
+class ARIAGridAccessible : public AccessibleWrap,
+                           public xpcAccessibleTable,
+                           public nsIAccessibleTable,
+                           public TableAccessible
+{
+public:
+  ARIAGridAccessible(nsIContent* aContent, DocAccessible* aDoc);
+
+  // nsISupports
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsIAccessibleTable
+  NS_FORWARD_NSIACCESSIBLETABLE(xpcAccessibleTable::)
+
+  // Accessible
+  virtual TableAccessible* AsTable() { return this; }
+  virtual void Shutdown();
+
+  // TableAccessible
+  virtual uint32_t ColCount();
+  virtual uint32_t RowCount();
+  virtual Accessible* CellAt(uint32_t aRowIndex, uint32_t aColumnIndex);
+  virtual bool IsColSelected(uint32_t aColIdx);
+  virtual bool IsRowSelected(uint32_t aRowIdx);
+  virtual bool IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx);
+  virtual uint32_t SelectedCellCount();
+  virtual uint32_t SelectedColCount();
+  virtual uint32_t SelectedRowCount();
+  virtual void SelectedCells(nsTArray<Accessible*>* aCells);
+  virtual void SelectedCellIndices(nsTArray<uint32_t>* aCells);
+  virtual void SelectedColIndices(nsTArray<uint32_t>* aCols);
+  virtual void SelectedRowIndices(nsTArray<uint32_t>* aRows);
+  virtual void SelectCol(uint32_t aColIdx);
+  virtual void SelectRow(uint32_t aRowIdx);
+  virtual void UnselectCol(uint32_t aColIdx);
+  virtual void UnselectRow(uint32_t aRowIdx);
+  virtual Accessible* AsAccessible() { return this; }
+
+protected:
+
+  /**
+   * Return true if the given row index is valid.
+   */
+  bool IsValidRow(int32_t aRow);
+
+  /**
+   * Retrn true if the given column index is valid.
+   */
+  bool IsValidColumn(int32_t aColumn);
+
+  /**
+   * Return row accessible at the given row index.
+   */
+  Accessible* GetRowAt(int32_t aRow);
+
+  /**
+   * Return cell accessible at the given column index in the row.
+   */
+  Accessible* GetCellInRowAt(Accessible* aRow, int32_t aColumn);
+
+  /**
+   * Set aria-selected attribute value on DOM node of the given accessible.
+   *
+   * @param  aAccessible  [in] accessible
+   * @param  aIsSelected  [in] new value of aria-selected attribute
+   * @param  aNotify      [in, optional] specifies if DOM should be notified
+   *                       about attribute change (used internally).
+   */
+  nsresult SetARIASelected(Accessible* aAccessible, bool aIsSelected,
+                           bool aNotify = true);
+};
+
+
+/**
+ * Accessible for ARIA gridcell and rowheader/columnheader.
+ */
+class ARIAGridCellAccessible : public HyperTextAccessibleWrap,
+                               public nsIAccessibleTableCell,
+                               public TableCellAccessible,
+                               public xpcAccessibleTableCell
+{
+public:
+  ARIAGridCellAccessible(nsIContent* aContent, DocAccessible* aDoc);
+
+  // nsISupports
+  NS_DECL_ISUPPORTS_INHERITED
+
+  // nsIAccessibleTableCell
+  NS_FORWARD_NSIACCESSIBLETABLECELL(xpcAccessibleTableCell::)
+
+  // Accessible
+  virtual TableCellAccessible* AsTableCell() { return this; }
+  virtual void Shutdown();
+  virtual void ApplyARIAState(uint64_t* aState) const;
+  virtual already_AddRefed<nsIPersistentProperties> NativeAttributes() MOZ_OVERRIDE;
+
+protected:
+
+  /**
+   * Return a containing row.
+   */
+  Accessible* Row() const
+  {
+    Accessible* row = Parent();
+    return row && row->Role() == roles::ROW ? row : nullptr;
+  }
+
+  /**
+   * Return a table for the given row.
+   */
+  Accessible* TableFor(Accessible* aRow) const;
+
+  /**
+   * Return index of the given row.
+   */
+  int32_t RowIndexFor(Accessible* aRow) const;
+
+  // TableCellAccessible
+  virtual TableAccessible* Table() const MOZ_OVERRIDE;
+  virtual uint32_t ColIdx() const MOZ_OVERRIDE;
+  virtual uint32_t RowIdx() const MOZ_OVERRIDE;
+  virtual bool Selected() MOZ_OVERRIDE;
+};
+
+} // namespace a11y
+} // namespace mozilla
+
+#endif