diff -r 000000000000 -r 6474c204b198 accessible/src/windows/msaa/ARIAGridAccessibleWrap.h
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/accessible/src/windows/msaa/ARIAGridAccessibleWrap.h	Wed Dec 31 06:09:35 2014 +0100
@@ -0,0 +1,61 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim:expandtab:shiftwidth=2:tabstop=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_ARIAGRIDACCESSIBLEWRAP_H
+#define MOZILLA_A11Y_ARIAGRIDACCESSIBLEWRAP_H
+
+#include "ARIAGridAccessible.h"
+#include "ia2AccessibleTable.h"
+#include "ia2AccessibleTableCell.h"
+
+namespace mozilla {
+namespace a11y {
+
+/**
+ * IA2 wrapper class for ARIAGridAccessible implementing IAccessibleTable and
+ * IAccessibleTable2 interfaces.
+ */
+class ARIAGridAccessibleWrap : public ARIAGridAccessible,
+                               public ia2AccessibleTable
+{
+public:
+  ARIAGridAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
+    ARIAGridAccessible(aContent, aDoc), ia2AccessibleTable(this) {}
+
+  // IUnknown
+  DECL_IUNKNOWN_INHERITED
+
+  // nsISupports
+  NS_DECL_ISUPPORTS_INHERITED
+
+  virtual void Shutdown() MOZ_OVERRIDE;
+};
+
+/**
+ * IA2 wrapper class for ARIAGridCellAccessible implementing
+ * IAccessibleTableCell interface.
+ */
+class ARIAGridCellAccessibleWrap : public ARIAGridCellAccessible,
+                                   public ia2AccessibleTableCell
+{
+public:
+  ARIAGridCellAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
+    ARIAGridCellAccessible(aContent, aDoc), ia2AccessibleTableCell(this) {}
+
+  // IUnknown
+  DECL_IUNKNOWN_INHERITED
+
+  // nsISupports
+  NS_DECL_ISUPPORTS_INHERITED
+
+  virtual void Shutdown() MOZ_OVERRIDE;
+};
+
+} // namespace a11y
+} // namespace mozilla
+
+#endif