wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 760758 - de-ns-ify nsHTMLTableAccessible, r=surkov

Browse Source 
--HG--
rename : accessible/src/atk/nsHTMLTableAccessibleWrap.h => accessible/src/atk/HTMLTableAccessibleWrap.h
rename : accessible/src/html/nsHTMLTableAccessible.cpp => accessible/src/html/HTMLTableAccessible.cpp
rename : accessible/src/html/nsHTMLTableAccessible.h => accessible/src/html/HTMLTableAccessible.h
rename : accessible/src/mac/nsHTMLTableAccessibleWrap.h => accessible/src/mac/HTMLTableAccessibleWrap.h
rename : accessible/src/msaa/nsHTMLTableAccessibleWrap.cpp => accessible/src/msaa/HTMLTableAccessibleWrap.cpp
rename : accessible/src/msaa/nsHTMLTableAccessibleWrap.h => accessible/src/msaa/HTMLTableAccessibleWrap.h
rename : accessible/src/other/nsHTMLTableAccessibleWrap.h => accessible/src/other/HTMLTableAccessibleWrap.h
This commit is contained in:
Mark Capella 2012-06-07 08:47:49 -04:00
parent 86768eb44d
commit a6c39d156b
17 changed files with 296 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
accessible/src/atk/HTMLTableAccessibleWrap.h Normal file
View File

@ -0,0 +1,23 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* 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_HTMLTableAccessibleWrap_h__
#define mozilla_a11y_HTMLTableAccessibleWrap_h__
#include "HTMLTableAccessible.h"
namespace mozilla {
namespace a11y {
typedef class HTMLTableAccessible HTMLTableAccessibleWrap;
typedef class HTMLTableCellAccessible HTMLTableCellAccessibleWrap;
typedef class HTMLTableHeaderCellAccessible HTMLTableHeaderCellAccessibleWrap;
} // namespace a11y
} // namespace mozilla
#endif

17
accessible/src/atk/nsHTMLTableAccessibleWrap.h
View File

@ -1,17 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set ts=2 et sw=2 tw=80: */
/* 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 _NSHTMLTABLEACCESSIBLEWRAP_H
#define _NSHTMLTABLEACCESSIBLEWRAP_H
#include "nsHTMLTableAccessible.h"
typedef class nsHTMLTableAccessible nsHTMLTableAccessibleWrap;
typedef class nsHTMLTableCellAccessible nsHTMLTableCellAccessibleWrap;
typedef class nsHTMLTableHeaderCellAccessible nsHTMLTableHeaderCellAccessibleWrap;
#endif

1
accessible/src/base/nsAccUtils.h
View File

@ -24,7 +24,6 @@
class nsAccessNode;
class Accessible;
class HyperTextAccessible;
class nsHTMLTableAccessible;
class DocAccessible;
struct nsRoleMapEntry;
#ifdef MOZ_XUL

11
accessible/src/base/nsAccessibilityService.cpp
View File

@ -20,12 +20,12 @@
#include "HTMLLinkAccessible.h"
#include "HTMLListAccessible.h"
#include "HTMLSelectAccessible.h"
#include "HTMLTableAccessibleWrap.h"
#include "HyperTextAccessibleWrap.h"
#include "nsAccessiblePivot.h"
#include "nsAccUtils.h"
#include "nsARIAMap.h"
#include "nsIAccessibleProvider.h"
#include "nsHTMLTableAccessibleWrap.h"
#include "nsXFormsFormControlsAccessible.h"
#include "nsXFormsWidgetsAccessible.h"
#include "OuterDocAccessible.h"
@ -385,7 +385,7 @@ nsAccessibilityService::CreateHTMLTableAccessible(nsIContent* aContent,
nsIPresShell* aPresShell)
{
Accessible* accessible =
new nsHTMLTableAccessibleWrap(aContent, GetDocAccessible(aPresShell));
new HTMLTableAccessibleWrap(aContent, GetDocAccessible(aPresShell));
NS_ADDREF(accessible);
return accessible;
}
@ -395,7 +395,7 @@ nsAccessibilityService::CreateHTMLTableCellAccessible(nsIContent* aContent,
nsIPresShell* aPresShell)
{
Accessible* accessible =
new nsHTMLTableCellAccessibleWrap(aContent, GetDocAccessible(aPresShell));
new HTMLTableCellAccessibleWrap(aContent, GetDocAccessible(aPresShell));
NS_ADDREF(accessible);
return accessible;
}
@ -465,7 +465,7 @@ nsAccessibilityService::CreateHTMLCaptionAccessible(nsIContent* aContent,
nsIPresShell* aPresShell)
{
Accessible* accessible =
new nsHTMLCaptionAccessible(aContent, GetDocAccessible(aPresShell));
new HTMLCaptionAccessible(aContent, GetDocAccessible(aPresShell));
NS_ADDREF(accessible);
return accessible;
}
@ -1660,8 +1660,7 @@ nsAccessibilityService::CreateHTMLAccessibleByMarkup(nsIFrame* aFrame,
}
if (nsCoreUtils::IsHTMLTableHeader(aContent)) {
Accessible* accessible = new nsHTMLTableHeaderCellAccessibleWrap(aContent,
aDoc);
Accessible* accessible = new HTMLTableHeaderCellAccessibleWrap(aContent, aDoc);
NS_IF_ADDREF(accessible);
return accessible;
}

193
accessible/src/html/nsHTMLTableAccessible.cpp → accessible/src/html/HTMLTableAccessible.cpp
View File

@ -3,7 +3,7 @@
* 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/. */
#include "nsHTMLTableAccessible.h"
#include "HTMLTableAccessible.h"
#include "Accessible-inl.h"
#include "nsAccessibilityService.h"
@ -39,33 +39,33 @@
using namespace mozilla::a11y;
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableCellAccessible
// HTMLTableCellAccessible
////////////////////////////////////////////////////////////////////////////////
nsHTMLTableCellAccessible::
nsHTMLTableCellAccessible(nsIContent* aContent, DocAccessible* aDoc) :
HTMLTableCellAccessible::
HTMLTableCellAccessible(nsIContent* aContent, DocAccessible* aDoc) :
HyperTextAccessibleWrap(aContent, aDoc)
{
}
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableCellAccessible: nsISupports implementation
// HTMLTableCellAccessible: nsISupports implementation
NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLTableCellAccessible,
NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableCellAccessible,
HyperTextAccessible,
nsIAccessibleTableCell)
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableCellAccessible: Accessible implementation
// HTMLTableCellAccessible: Accessible implementation
role
nsHTMLTableCellAccessible::NativeRole()
HTMLTableCellAccessible::NativeRole()
{
return roles::CELL;
}
PRUint64
nsHTMLTableCellAccessible::NativeState()
HTMLTableCellAccessible::NativeState()
{
PRUint64 state = HyperTextAccessibleWrap::NativeState();
@ -79,13 +79,13 @@ nsHTMLTableCellAccessible::NativeState()
}
PRUint64
nsHTMLTableCellAccessible::NativeInteractiveState() const
HTMLTableCellAccessible::NativeInteractiveState() const
{
return HyperTextAccessibleWrap::NativeInteractiveState() | states::SELECTABLE;
}
nsresult
nsHTMLTableCellAccessible::GetAttributesInternal(nsIPersistentProperties *aAttributes)
HTMLTableCellAccessible::GetAttributesInternal(nsIPersistentProperties* aAttributes)
{
if (IsDefunct())
return NS_ERROR_FAILURE;
@ -139,10 +139,10 @@ nsHTMLTableCellAccessible::GetAttributesInternal(nsIPersistentProperties *aAttri
}
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableCellAccessible: nsIAccessibleTableCell implementation
// HTMLTableCellAccessible: nsIAccessibleTableCell implementation
NS_IMETHODIMP
nsHTMLTableCellAccessible::GetTable(nsIAccessibleTable **aTable)
HTMLTableCellAccessible::GetTable(nsIAccessibleTable** aTable)
{
NS_ENSURE_ARG_POINTER(aTable);
*aTable = nsnull;
@ -157,7 +157,7 @@ nsHTMLTableCellAccessible::GetTable(nsIAccessibleTable **aTable)
}
NS_IMETHODIMP
nsHTMLTableCellAccessible::GetColumnIndex(PRInt32 *aColumnIndex)
HTMLTableCellAccessible::GetColumnIndex(PRInt32* aColumnIndex)
{
NS_ENSURE_ARG_POINTER(aColumnIndex);
*aColumnIndex = -1;
@ -172,7 +172,7 @@ nsHTMLTableCellAccessible::GetColumnIndex(PRInt32 *aColumnIndex)
}
NS_IMETHODIMP
nsHTMLTableCellAccessible::GetRowIndex(PRInt32 *aRowIndex)
HTMLTableCellAccessible::GetRowIndex(PRInt32* aRowIndex)
{
NS_ENSURE_ARG_POINTER(aRowIndex);
*aRowIndex = -1;
@ -187,7 +187,7 @@ nsHTMLTableCellAccessible::GetRowIndex(PRInt32 *aRowIndex)
}
NS_IMETHODIMP
nsHTMLTableCellAccessible::GetColumnExtent(PRInt32 *aExtentCount)
HTMLTableCellAccessible::GetColumnExtent(PRInt32* aExtentCount)
{
NS_ENSURE_ARG_POINTER(aExtentCount);
*aExtentCount = 1;
@ -202,7 +202,7 @@ nsHTMLTableCellAccessible::GetColumnExtent(PRInt32 *aExtentCount)
}
NS_IMETHODIMP
nsHTMLTableCellAccessible::GetRowExtent(PRInt32 *aExtentCount)
HTMLTableCellAccessible::GetRowExtent(PRInt32* aExtentCount)
{
NS_ENSURE_ARG_POINTER(aExtentCount);
*aExtentCount = 1;
@ -217,7 +217,7 @@ nsHTMLTableCellAccessible::GetRowExtent(PRInt32 *aExtentCount)
}
NS_IMETHODIMP
nsHTMLTableCellAccessible::GetColumnHeaderCells(nsIArray **aHeaderCells)
HTMLTableCellAccessible::GetColumnHeaderCells(nsIArray** aHeaderCells)
{
NS_ENSURE_ARG_POINTER(aHeaderCells);
*aHeaderCells = nsnull;
@ -229,7 +229,7 @@ nsHTMLTableCellAccessible::GetColumnHeaderCells(nsIArray **aHeaderCells)
}
NS_IMETHODIMP
nsHTMLTableCellAccessible::GetRowHeaderCells(nsIArray **aHeaderCells)
HTMLTableCellAccessible::GetRowHeaderCells(nsIArray** aHeaderCells)
{
NS_ENSURE_ARG_POINTER(aHeaderCells);
*aHeaderCells = nsnull;
@ -241,7 +241,7 @@ nsHTMLTableCellAccessible::GetRowHeaderCells(nsIArray **aHeaderCells)
}
NS_IMETHODIMP
nsHTMLTableCellAccessible::IsSelected(bool *aIsSelected)
HTMLTableCellAccessible::IsSelected(bool* aIsSelected)
{
NS_ENSURE_ARG_POINTER(aIsSelected);
*aIsSelected = false;
@ -259,10 +259,10 @@ nsHTMLTableCellAccessible::IsSelected(bool *aIsSelected)
}
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableCellAccessible: protected implementation
// HTMLTableCellAccessible: protected implementation
already_AddRefed<nsIAccessibleTable>
nsHTMLTableCellAccessible::GetTableAccessible()
HTMLTableCellAccessible::GetTableAccessible()
{
Accessible* parent = this;
while ((parent = parent->Parent())) {
@ -278,7 +278,7 @@ nsHTMLTableCellAccessible::GetTableAccessible()
}
nsITableCellLayout*
nsHTMLTableCellAccessible::GetCellLayout()
HTMLTableCellAccessible::GetCellLayout()
{
nsIFrame *frame = mContent->GetPrimaryFrame();
NS_ASSERTION(frame, "The frame cannot be obtaied for HTML table cell.");
@ -290,8 +290,7 @@ nsHTMLTableCellAccessible::GetCellLayout()
}
nsresult
nsHTMLTableCellAccessible::GetCellIndexes(PRInt32& aRowIndex,
PRInt32& aColIndex)
HTMLTableCellAccessible::GetCellIndexes(PRInt32& aRowIndex, PRInt32& aColIndex)
{
nsITableCellLayout *cellLayout = GetCellLayout();
NS_ENSURE_STATE(cellLayout);
@ -300,8 +299,8 @@ nsHTMLTableCellAccessible::GetCellIndexes(PRInt32& aRowIndex,
}
nsresult
nsHTMLTableCellAccessible::GetHeaderCells(PRInt32 aRowOrColumnHeaderCell,
nsIArray **aHeaderCells)
HTMLTableCellAccessible::GetHeaderCells(PRInt32 aRowOrColumnHeaderCell,
nsIArray** aHeaderCells)
{
// Get header cells from @header attribute.
IDRefsIterator iter(mDoc, mContent, nsGkAtoms::headers);
@ -341,21 +340,20 @@ nsHTMLTableCellAccessible::GetHeaderCells(PRInt32 aRowOrColumnHeaderCell,
}
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableHeaderAccessible
// HTMLTableHeaderCellAccessible
////////////////////////////////////////////////////////////////////////////////
nsHTMLTableHeaderCellAccessible::
nsHTMLTableHeaderCellAccessible(nsIContent* aContent,
DocAccessible* aDoc) :
nsHTMLTableCellAccessible(aContent, aDoc)
HTMLTableHeaderCellAccessible::
HTMLTableHeaderCellAccessible(nsIContent* aContent, DocAccessible* aDoc) :
HTMLTableCellAccessible(aContent, aDoc)
{
}
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableHeaderAccessible: Accessible implementation
// HTMLTableHeaderCellAccessible: Accessible implementation
role
nsHTMLTableHeaderCellAccessible::NativeRole()
HTMLTableHeaderCellAccessible::NativeRole()
{
// Check value of @scope attribute.
static nsIContent::AttrValuesArray scopeValues[] =
@ -401,26 +399,26 @@ nsHTMLTableHeaderCellAccessible::NativeRole()
}
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableAccessible
// HTMLTableAccessible
////////////////////////////////////////////////////////////////////////////////
nsHTMLTableAccessible::
nsHTMLTableAccessible(nsIContent* aContent, DocAccessible* aDoc) :
HTMLTableAccessible::
HTMLTableAccessible(nsIContent* aContent, DocAccessible* aDoc) :
AccessibleWrap(aContent, aDoc), xpcAccessibleTable(this)
{
}
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableAccessible: nsISupports implementation
// HTMLTableAccessible: nsISupports implementation
NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLTableAccessible, Accessible,
NS_IMPL_ISUPPORTS_INHERITED1(HTMLTableAccessible, Accessible,
nsIAccessibleTable)
////////////////////////////////////////////////////////////////////////////////
//nsAccessNode
void
nsHTMLTableAccessible::Shutdown()
HTMLTableAccessible::Shutdown()
{
mTable = nsnull;
AccessibleWrap::Shutdown();
@ -428,10 +426,10 @@ nsHTMLTableAccessible::Shutdown()
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableAccessible: Accessible implementation
// HTMLTableAccessible: Accessible implementation
void
nsHTMLTableAccessible::CacheChildren()
HTMLTableAccessible::CacheChildren()
{
// Move caption accessible so that it's the first child. Check for the first
// caption only, because nsAccessibilityService ensures we don't create
@ -451,19 +449,19 @@ nsHTMLTableAccessible::CacheChildren()
}
role
nsHTMLTableAccessible::NativeRole()
HTMLTableAccessible::NativeRole()
{
return roles::TABLE;
}
PRUint64
nsHTMLTableAccessible::NativeState()
HTMLTableAccessible::NativeState()
{
return Accessible::NativeState() | states::READONLY;
}
nsresult
nsHTMLTableAccessible::GetNameInternal(nsAString& aName)
HTMLTableAccessible::GetNameInternal(nsAString& aName)
{
Accessible::GetNameInternal(aName);
if (!aName.IsEmpty())
@ -486,7 +484,7 @@ nsHTMLTableAccessible::GetNameInternal(nsAString& aName)
}
nsresult
nsHTMLTableAccessible::GetAttributesInternal(nsIPersistentProperties *aAttributes)
HTMLTableAccessible::GetAttributesInternal(nsIPersistentProperties* aAttributes)
{
nsresult rv = AccessibleWrap::GetAttributesInternal(aAttributes);
NS_ENSURE_SUCCESS(rv, rv);
@ -501,10 +499,10 @@ nsHTMLTableAccessible::GetAttributesInternal(nsIPersistentProperties *aAttribute
}
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableAccessible: nsIAccessible implementation
// HTMLTableAccessible: nsIAccessible implementation
Relation
nsHTMLTableAccessible::RelationByType(PRUint32 aType)
HTMLTableAccessible::RelationByType(PRUint32 aType)
{
Relation rel = AccessibleWrap::RelationByType(aType);
if (aType == nsIAccessibleRelation::RELATION_LABELLED_BY)
@ -514,17 +512,17 @@ nsHTMLTableAccessible::RelationByType(PRUint32 aType)
}
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableAccessible: nsIAccessibleTable implementation
// HTMLTableAccessible: nsIAccessibleTable implementation
Accessible*
nsHTMLTableAccessible::Caption()
HTMLTableAccessible::Caption()
{
Accessible* child = mChildren.SafeElementAt(0, nsnull);
return child && child->Role() == roles::CAPTION ? child : nsnull;
}
void
nsHTMLTableAccessible::Summary(nsString& aSummary)
HTMLTableAccessible::Summary(nsString& aSummary)
{
nsCOMPtr<nsIDOMHTMLTableElement> table(do_QueryInterface(mContent));
@ -533,7 +531,7 @@ nsHTMLTableAccessible::Summary(nsString& aSummary)
}
PRUint32
nsHTMLTableAccessible::ColCount()
HTMLTableAccessible::ColCount()
{
nsITableLayout* tableLayout = GetTableLayout();
if (!tableLayout)
@ -545,7 +543,7 @@ nsHTMLTableAccessible::ColCount()
}
PRUint32
nsHTMLTableAccessible::RowCount()
HTMLTableAccessible::RowCount()
{
nsITableLayout* tableLayout = GetTableLayout();
if (!tableLayout)
@ -557,7 +555,7 @@ nsHTMLTableAccessible::RowCount()
}
NS_IMETHODIMP
nsHTMLTableAccessible::GetSelectedCellCount(PRUint32* aCount)
HTMLTableAccessible::GetSelectedCellCount(PRUint32* aCount)
{
NS_ENSURE_ARG_POINTER(aCount);
*aCount = 0;
@ -600,7 +598,7 @@ nsHTMLTableAccessible::GetSelectedCellCount(PRUint32* aCount)
}
NS_IMETHODIMP
nsHTMLTableAccessible::GetSelectedColumnCount(PRUint32* aCount)
HTMLTableAccessible::GetSelectedColumnCount(PRUint32* aCount)
{
NS_ENSURE_ARG_POINTER(aCount);
*aCount = 0;
@ -623,7 +621,7 @@ nsHTMLTableAccessible::GetSelectedColumnCount(PRUint32* aCount)
}
NS_IMETHODIMP
nsHTMLTableAccessible::GetSelectedRowCount(PRUint32* aCount)
HTMLTableAccessible::GetSelectedRowCount(PRUint32* aCount)
{
NS_ENSURE_ARG_POINTER(aCount);
*aCount = 0;
@ -646,7 +644,7 @@ nsHTMLTableAccessible::GetSelectedRowCount(PRUint32* aCount)
}
NS_IMETHODIMP
nsHTMLTableAccessible::GetSelectedCells(nsIArray **aCells)
HTMLTableAccessible::GetSelectedCells(nsIArray** aCells)
{
NS_ENSURE_ARG_POINTER(aCells);
*aCells = nsnull;
@ -696,8 +694,8 @@ nsHTMLTableAccessible::GetSelectedCells(nsIArray **aCells)
}
NS_IMETHODIMP
nsHTMLTableAccessible::GetSelectedCellIndices(PRUint32 *aNumCells,
PRInt32 **aCells)
HTMLTableAccessible::GetSelectedCellIndices(PRUint32* aNumCells,
PRInt32** aCells)
{
NS_ENSURE_ARG_POINTER(aNumCells);
*aNumCells = 0;
@ -766,8 +764,8 @@ nsHTMLTableAccessible::GetSelectedCellIndices(PRUint32 *aNumCells,
}
NS_IMETHODIMP
nsHTMLTableAccessible::GetSelectedColumnIndices(PRUint32 *aNumColumns,
PRInt32 **aColumns)
HTMLTableAccessible::GetSelectedColumnIndices(PRUint32* aNumColumns,
PRInt32** aColumns)
{
nsresult rv = NS_OK;
@ -808,8 +806,8 @@ nsHTMLTableAccessible::GetSelectedColumnIndices(PRUint32 *aNumColumns,
}
NS_IMETHODIMP
nsHTMLTableAccessible::GetSelectedRowIndices(PRUint32 *aNumRows,
PRInt32 **aRows)
HTMLTableAccessible::GetSelectedRowIndices(PRUint32* aNumRows,
PRInt32** aRows)
{
nsresult rv = NS_OK;
@ -850,7 +848,7 @@ nsHTMLTableAccessible::GetSelectedRowIndices(PRUint32 *aNumRows,
}
Accessible*
nsHTMLTableAccessible::CellAt(PRUint32 aRowIndex, PRUint32 aColumnIndex)
HTMLTableAccessible::CellAt(PRUint32 aRowIndex, PRUint32 aColumnIndex)
{
nsCOMPtr<nsIDOMElement> cellElement;
GetCellAt(aRowIndex, aColumnIndex, *getter_AddRefs(cellElement));
@ -869,7 +867,7 @@ nsHTMLTableAccessible::CellAt(PRUint32 aRowIndex, PRUint32 aColumnIndex)
}
PRInt32
nsHTMLTableAccessible::CellIndexAt(PRUint32 aRowIdx, PRUint32 aColIdx)
HTMLTableAccessible::CellIndexAt(PRUint32 aRowIdx, PRUint32 aColIdx)
{
nsITableLayout* tableLayout = GetTableLayout();
@ -879,7 +877,7 @@ nsHTMLTableAccessible::CellIndexAt(PRUint32 aRowIdx, PRUint32 aColIdx)
}
NS_IMETHODIMP
nsHTMLTableAccessible::GetColumnIndexAt(PRInt32 aIndex, PRInt32 *aColumn)
HTMLTableAccessible::GetColumnIndexAt(PRInt32 aIndex, PRInt32* aColumn)
{
NS_ENSURE_ARG_POINTER(aColumn);
@ -897,7 +895,7 @@ nsHTMLTableAccessible::GetColumnIndexAt(PRInt32 aIndex, PRInt32 *aColumn)
}
NS_IMETHODIMP
nsHTMLTableAccessible::GetRowIndexAt(PRInt32 aIndex, PRInt32 *aRow)
HTMLTableAccessible::GetRowIndexAt(PRInt32 aIndex, PRInt32* aRow)
{
NS_ENSURE_ARG_POINTER(aRow);
@ -915,9 +913,9 @@ nsHTMLTableAccessible::GetRowIndexAt(PRInt32 aIndex, PRInt32 *aRow)
}
NS_IMETHODIMP
nsHTMLTableAccessible::GetRowAndColumnIndicesAt(PRInt32 aIndex,
PRInt32* aRowIdx,
PRInt32* aColumnIdx)
HTMLTableAccessible::GetRowAndColumnIndicesAt(PRInt32 aIndex,
PRInt32* aRowIdx,
PRInt32* aColumnIdx)
{
NS_ENSURE_ARG_POINTER(aRowIdx);
*aRowIdx = -1;
@ -935,7 +933,7 @@ nsHTMLTableAccessible::GetRowAndColumnIndicesAt(PRInt32 aIndex,
}
PRUint32
nsHTMLTableAccessible::ColExtentAt(PRUint32 aRowIdx, PRUint32 aColIdx)
HTMLTableAccessible::ColExtentAt(PRUint32 aRowIdx, PRUint32 aColIdx)
{
nsITableLayout* tableLayout = GetTableLayout();
if (!tableLayout)
@ -955,7 +953,7 @@ nsHTMLTableAccessible::ColExtentAt(PRUint32 aRowIdx, PRUint32 aColIdx)
}
PRUint32
nsHTMLTableAccessible::RowExtentAt(PRUint32 aRowIdx, PRUint32 aColIdx)
HTMLTableAccessible::RowExtentAt(PRUint32 aRowIdx, PRUint32 aColIdx)
{
nsITableLayout* tableLayout = GetTableLayout();
if (!tableLayout)
@ -975,19 +973,19 @@ nsHTMLTableAccessible::RowExtentAt(PRUint32 aRowIdx, PRUint32 aColIdx)
}
NS_IMETHODIMP
nsHTMLTableAccessible::GetColumnDescription(PRInt32 aColumn, nsAString &_retval)
HTMLTableAccessible::GetColumnDescription(PRInt32 aColumn, nsAString& _retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsHTMLTableAccessible::GetRowDescription(PRInt32 aRow, nsAString &_retval)
HTMLTableAccessible::GetRowDescription(PRInt32 aRow, nsAString& _retval)
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsHTMLTableAccessible::IsColumnSelected(PRInt32 aColumn, bool *aIsSelected)
HTMLTableAccessible::IsColumnSelected(PRInt32 aColumn, bool* aIsSelected)
{
NS_ENSURE_ARG_POINTER(aIsSelected);
*aIsSelected = false;
@ -1017,7 +1015,7 @@ nsHTMLTableAccessible::IsColumnSelected(PRInt32 aColumn, bool *aIsSelected)
}
NS_IMETHODIMP
nsHTMLTableAccessible::IsRowSelected(PRInt32 aRow, bool *aIsSelected)
HTMLTableAccessible::IsRowSelected(PRInt32 aRow, bool* aIsSelected)
{
NS_ENSURE_ARG_POINTER(aIsSelected);
*aIsSelected = false;
@ -1047,8 +1045,8 @@ nsHTMLTableAccessible::IsRowSelected(PRInt32 aRow, bool *aIsSelected)
}
NS_IMETHODIMP
nsHTMLTableAccessible::IsCellSelected(PRInt32 aRow, PRInt32 aColumn,
bool *aIsSelected)
HTMLTableAccessible::IsCellSelected(PRInt32 aRow, PRInt32 aColumn,
bool* aIsSelected)
{
NS_ENSURE_ARG_POINTER(aIsSelected);
*aIsSelected = false;
@ -1071,7 +1069,7 @@ nsHTMLTableAccessible::IsCellSelected(PRInt32 aRow, PRInt32 aColumn,
}
NS_IMETHODIMP
nsHTMLTableAccessible::SelectRow(PRInt32 aRow)
HTMLTableAccessible::SelectRow(PRInt32 aRow)
{
if (IsDefunct())
return NS_ERROR_FAILURE;
@ -1087,7 +1085,7 @@ nsHTMLTableAccessible::SelectRow(PRInt32 aRow)
}
NS_IMETHODIMP
nsHTMLTableAccessible::SelectColumn(PRInt32 aColumn)
HTMLTableAccessible::SelectColumn(PRInt32 aColumn)
{
if (IsDefunct())
return NS_ERROR_FAILURE;
@ -1103,7 +1101,7 @@ nsHTMLTableAccessible::SelectColumn(PRInt32 aColumn)
}
void
nsHTMLTableAccessible::UnselectRow(PRUint32 aRowIdx)
HTMLTableAccessible::UnselectRow(PRUint32 aRowIdx)
{
RemoveRowsOrColumnsFromSelection(aRowIdx,
nsISelectionPrivate::TABLESELECTION_ROW,
@ -1111,7 +1109,7 @@ nsHTMLTableAccessible::UnselectRow(PRUint32 aRowIdx)
}
void
nsHTMLTableAccessible::UnselectCol(PRUint32 aColIdx)
HTMLTableAccessible::UnselectCol(PRUint32 aColIdx)
{
RemoveRowsOrColumnsFromSelection(aColIdx,
nsISelectionPrivate::TABLESELECTION_COLUMN,
@ -1119,8 +1117,7 @@ nsHTMLTableAccessible::UnselectCol(PRUint32 aColIdx)
}
nsresult
nsHTMLTableAccessible::AddRowOrColumnToSelection(PRInt32 aIndex,
PRUint32 aTarget)
HTMLTableAccessible::AddRowOrColumnToSelection(PRInt32 aIndex, PRUint32 aTarget)
{
bool doSelectRow = (aTarget == nsISelectionPrivate::TABLESELECTION_ROW);
@ -1166,9 +1163,9 @@ nsHTMLTableAccessible::AddRowOrColumnToSelection(PRInt32 aIndex,
}
nsresult
nsHTMLTableAccessible::RemoveRowsOrColumnsFromSelection(PRInt32 aIndex,
PRUint32 aTarget,
bool aIsOuter)
HTMLTableAccessible::RemoveRowsOrColumnsFromSelection(PRInt32 aIndex,
PRUint32 aTarget,
bool aIsOuter)
{
nsITableLayout *tableLayout = GetTableLayout();
NS_ENSURE_STATE(tableLayout);
@ -1198,7 +1195,7 @@ nsHTMLTableAccessible::RemoveRowsOrColumnsFromSelection(PRInt32 aIndex,
}
nsITableLayout*
nsHTMLTableAccessible::GetTableLayout()
HTMLTableAccessible::GetTableLayout()
{
nsIFrame *frame = mContent->GetPrimaryFrame();
if (!frame)
@ -1209,9 +1206,8 @@ nsHTMLTableAccessible::GetTableLayout()
}
nsresult
nsHTMLTableAccessible::GetCellAt(PRInt32 aRowIndex,
PRInt32 aColIndex,
nsIDOMElement* &aCell)
HTMLTableAccessible::GetCellAt(PRInt32 aRowIndex, PRInt32 aColIndex,
nsIDOMElement*& aCell)
{
PRInt32 startRowIndex = 0, startColIndex = 0,
rowSpan, colSpan, actualRowSpan, actualColSpan;
@ -1230,7 +1226,7 @@ nsHTMLTableAccessible::GetCellAt(PRInt32 aRowIndex,
}
void
nsHTMLTableAccessible::Description(nsString& aDescription)
HTMLTableAccessible::Description(nsString& aDescription)
{
// Helpful for debugging layout vs. data tables
aDescription.Truncate();
@ -1265,8 +1261,7 @@ nsHTMLTableAccessible::Description(nsString& aDescription)
}
bool
nsHTMLTableAccessible::HasDescendant(const nsAString& aTagName,
bool aAllowEmpty)
HTMLTableAccessible::HasDescendant(const nsAString& aTagName, bool aAllowEmpty)
{
nsCOMPtr<nsIDOMElement> tableElt(do_QueryInterface(mContent));
NS_ENSURE_TRUE(tableElt, false);
@ -1299,13 +1294,13 @@ nsHTMLTableAccessible::HasDescendant(const nsAString& aTagName,
// performance problems only. Note, currently 'aAllowEmpty' flag is used for
// caption element only. On another hand we create accessible object for
// the first entry of caption element (see
// nsHTMLTableAccessible::CacheChildren).
// HTMLTableAccessible::CacheChildren).
nodeList->Item(1, getter_AddRefs(foundItem));
return !!foundItem;
}
bool
nsHTMLTableAccessible::IsProbablyLayoutTable()
HTMLTableAccessible::IsProbablyLayoutTable()
{
// Implement a heuristic to determine if table is most likely used for layout
// XXX do we want to look for rowspan or colspan, especialy that span all but a couple cells
@ -1509,11 +1504,11 @@ nsHTMLTableAccessible::IsProbablyLayoutTable()
////////////////////////////////////////////////////////////////////////////////
// nsHTMLCaptionAccessible
// HTMLCaptionAccessible
////////////////////////////////////////////////////////////////////////////////
Relation
nsHTMLCaptionAccessible::RelationByType(PRUint32 aType)
HTMLCaptionAccessible::RelationByType(PRUint32 aType)
{
Relation rel = HyperTextAccessible::RelationByType(aType);
if (aType == nsIAccessibleRelation::RELATION_LABEL_FOR)
@ -1523,7 +1518,7 @@ nsHTMLCaptionAccessible::RelationByType(PRUint32 aType)
}
role
nsHTMLCaptionAccessible::NativeRole()
HTMLCaptionAccessible::NativeRole()
{
return roles::CAPTION;
}

51
accessible/src/html/nsHTMLTableAccessible.h → accessible/src/html/HTMLTableAccessible.h
View File

@ -3,8 +3,8 @@
* 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 _nsHTMLTableAccessible_H_
#define _nsHTMLTableAccessible_H_
#ifndef mozilla_a11y_HTMLTableAccessible_h__
#define mozilla_a11y_HTMLTableAccessible_h__
#include "HyperTextAccessibleWrap.h"
#include "nsIAccessibleTable.h"
@ -14,14 +14,17 @@
class nsITableLayout;
class nsITableCellLayout;
namespace mozilla {
namespace a11y {
/**
* HTML table cell accessible (html:td).
*/
class nsHTMLTableCellAccessible : public HyperTextAccessibleWrap,
public nsIAccessibleTableCell
class HTMLTableCellAccessible : public HyperTextAccessibleWrap,
public nsIAccessibleTableCell
{
public:
nsHTMLTableCellAccessible(nsIContent* aContent, DocAccessible* aDoc);
HTMLTableCellAccessible(nsIContent* aContent, DocAccessible* aDoc);
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
@ -30,7 +33,7 @@ public:
NS_DECL_NSIACCESSIBLETABLECELL
// Accessible
virtual mozilla::a11y::role NativeRole();
virtual a11y::role NativeRole();
virtual PRUint64 NativeState();
virtual PRUint64 NativeInteractiveState() const;
virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);
@ -62,14 +65,13 @@ protected:
/**
* HTML table row/column header accessible (html:th or html:td@scope).
*/
class nsHTMLTableHeaderCellAccessible : public nsHTMLTableCellAccessible
class HTMLTableHeaderCellAccessible : public HTMLTableCellAccessible
{
public:
nsHTMLTableHeaderCellAccessible(nsIContent* aContent,
DocAccessible* aDoc);
HTMLTableHeaderCellAccessible(nsIContent* aContent, DocAccessible* aDoc);
// Accessible
virtual mozilla::a11y::role NativeRole();
virtual a11y::role NativeRole();
};
@ -82,13 +84,13 @@ public:
// data vs. layout heuristic
// #define SHOW_LAYOUT_HEURISTIC
class nsHTMLTableAccessible : public AccessibleWrap,
public xpcAccessibleTable,
public nsIAccessibleTable,
public mozilla::a11y::TableAccessible
class HTMLTableAccessible : public AccessibleWrap,
public xpcAccessibleTable,
public nsIAccessibleTable,
public TableAccessible
{
public:
nsHTMLTableAccessible(nsIContent* aContent, DocAccessible* aDoc);
HTMLTableAccessible(nsIContent* aContent, DocAccessible* aDoc);
NS_DECL_ISUPPORTS_INHERITED
@ -115,12 +117,12 @@ public:
virtual mozilla::a11y::TableAccessible* AsTable() { return this; }
virtual void Description(nsString& aDescription);
virtual nsresult GetNameInternal(nsAString& aName);
virtual mozilla::a11y::role NativeRole();
virtual a11y::role NativeRole();
virtual PRUint64 NativeState();
virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);
virtual Relation RelationByType(PRUint32 aRelationType);
// nsHTMLTableAccessible
// HTMLTableAccessible
/**
* Retun cell element at the given row and column index.
@ -138,7 +140,7 @@ protected:
// Accessible
virtual void CacheChildren();
// nsHTMLTableAccessible
// HTMLTableAccessible
/**
* Add row or column to selection.
@ -179,18 +181,21 @@ protected:
/**
* HTML caption accessible (html:caption).
*/
class nsHTMLCaptionAccessible : public HyperTextAccessibleWrap
class HTMLCaptionAccessible : public HyperTextAccessibleWrap
{
public:
nsHTMLCaptionAccessible(nsIContent* aContent, DocAccessible* aDoc) :
HTMLCaptionAccessible(nsIContent* aContent, DocAccessible* aDoc) :
HyperTextAccessibleWrap(aContent, aDoc) { }
virtual ~nsHTMLCaptionAccessible() { }
virtual ~HTMLCaptionAccessible() { }
// nsIAccessible
// Accessible
virtual mozilla::a11y::role NativeRole();
virtual a11y::role NativeRole();
virtual Relation RelationByType(PRUint32 aRelationType);
};
#endif
} // namespace a11y
} // namespace mozilla
#endif

2
accessible/src/html/Makefile.in
View File

@ -24,7 +24,7 @@ CPPSRCS = \
HTMLLinkAccessible.cpp \
HTMLListAccessible.cpp \
HTMLSelectAccessible.cpp \
nsHTMLTableAccessible.cpp \
HTMLTableAccessible.cpp \
$(NULL)
# we don't want the shared lib, but we want to force the creation of a static lib.

4
accessible/src/mac/AccessibleWrap.h
View File

@ -109,8 +109,4 @@ private:
bool mNativeInited;
};
// Define unsupported wrap classes here
typedef class nsHTMLTableCellAccessible nsHTMLTableCellAccessibleWrap;
typedef class nsHTMLTableAccessible nsHTMLTableAccessibleWrap;
#endif

24
accessible/src/mac/HTMLTableAccessibleWrap.h Normal file
View File

@ -0,0 +1,24 @@
/* -*- 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_HTMLTableAccessibleWrap_h__
#define mozilla_a11y_HTMLTableAccessibleWrap_h__
#include "HTMLTableAccessible.h"
namespace mozilla {
namespace a11y {
typedef class HTMLTableAccessible HTMLTableAccessibleWrap;
typedef class HTMLTableCellAccessible HTMLTableCellAccessibleWrap;
typedef class HTMLTableHeaderCellAccessible HTMLTableHeaderCellAccessibleWrap;
} // namespace a11y
} // namespace mozilla
#endif

18
accessible/src/mac/nsHTMLTableAccessibleWrap.h
View File

@ -1,18 +0,0 @@
/* -*- 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 _NSHTMLTABLEACCESSIBLEWRAP_H
#define _NSHTMLTABLEACCESSIBLEWRAP_H
#include "nsHTMLTableAccessible.h"
typedef class nsHTMLTableAccessible nsHTMLTableAccessibleWrap;
typedef class nsHTMLTableCellAccessible nsHTMLTableCellAccessibleWrap;
typedef class nsHTMLTableHeaderCellAccessible nsHTMLTableHeaderCellAccessibleWrap;
#endif

28
accessible/src/msaa/nsHTMLTableAccessibleWrap.cpp → accessible/src/msaa/HTMLTableAccessibleWrap.cpp
View File

@ -5,39 +5,41 @@
* 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/. */
#include "nsHTMLTableAccessibleWrap.h"
#include "HTMLTableAccessibleWrap.h"
using namespace mozilla::a11y;
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableAccessibleWrap
// HTMLTableAccessibleWrap
////////////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLTableAccessibleWrap,
nsHTMLTableAccessible)
NS_IMPL_ISUPPORTS_INHERITED0(HTMLTableAccessibleWrap,
HTMLTableAccessible)
IMPL_IUNKNOWN_INHERITED1(nsHTMLTableAccessibleWrap,
IMPL_IUNKNOWN_INHERITED1(HTMLTableAccessibleWrap,
AccessibleWrap,
CAccessibleTable)
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableCellAccessibleWrap
// HTMLTableCellAccessibleWrap
////////////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLTableCellAccessibleWrap,
nsHTMLTableCellAccessible)
NS_IMPL_ISUPPORTS_INHERITED0(HTMLTableCellAccessibleWrap,
HTMLTableCellAccessible)
IMPL_IUNKNOWN_INHERITED1(nsHTMLTableCellAccessibleWrap,
IMPL_IUNKNOWN_INHERITED1(HTMLTableCellAccessibleWrap,
HyperTextAccessibleWrap,
CAccessibleTableCell)
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableCellAccessibleWrap
// HTMLTableCellAccessibleWrap
////////////////////////////////////////////////////////////////////////////////
NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLTableHeaderCellAccessibleWrap,
nsHTMLTableHeaderCellAccessible)
NS_IMPL_ISUPPORTS_INHERITED0(HTMLTableHeaderCellAccessibleWrap,
HTMLTableHeaderCellAccessible)
IMPL_IUNKNOWN_INHERITED1(nsHTMLTableHeaderCellAccessibleWrap,
IMPL_IUNKNOWN_INHERITED1(HTMLTableHeaderCellAccessibleWrap,
HyperTextAccessibleWrap,
CAccessibleTableCell)

80
accessible/src/msaa/HTMLTableAccessibleWrap.h Normal file
View File

@ -0,0 +1,80 @@
/* -*- 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_HTMLTableAccessibleWrap_h__
#define mozilla_a11y_HTMLTableAccessibleWrap_h__
#include "HTMLTableAccessible.h"
#include "CAccessibleTable.h"
#include "CAccessibleTableCell.h"
namespace mozilla {
namespace a11y {
/**
* IA2 wrapper class for HTMLTableAccessible implementing IAccessibleTable
* and IAccessibleTable2 interfaces.
*/
class HTMLTableAccessibleWrap : public HTMLTableAccessible,
public CAccessibleTable
{
public:
HTMLTableAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
HTMLTableAccessible(aContent, aDoc) {}
// IUnknown
DECL_IUNKNOWN_INHERITED
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
};
/**
* IA2 wrapper class for HTMLTableCellAccessible implementing
* IAccessibleTableCell interface.
*/
class HTMLTableCellAccessibleWrap : public HTMLTableCellAccessible,
public CAccessibleTableCell
{
public:
HTMLTableCellAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
HTMLTableCellAccessible(aContent, aDoc) {}
// IUnknown
DECL_IUNKNOWN_INHERITED
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
};
/**
* IA2 wrapper class for HTMLTableHeaderCellAccessible implementing
* IAccessibleTableCell interface.
*/
class HTMLTableHeaderCellAccessibleWrap : public HTMLTableHeaderCellAccessible,
public CAccessibleTableCell
{
public:
HTMLTableHeaderCellAccessibleWrap(nsIContent* aContent,
DocAccessible* aDoc) :
HTMLTableHeaderCellAccessible(aContent, aDoc) {}
// IUnknown
DECL_IUNKNOWN_INHERITED
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
};
} // namespace a11y
} // namespace mozilla
#endif

2
accessible/src/msaa/Makefile.in
View File

@ -20,6 +20,7 @@ CPPSRCS = \
ApplicationAccessibleWrap.cpp \
ARIAGridAccessibleWrap.cpp \
DocAccessibleWrap.cpp \
HTMLTableAccessibleWrap.cpp \
HyperTextAccessibleWrap.cpp \
ImageAccessibleWrap.cpp \
nsAccessNodeWrap.cpp \
@ -27,7 +28,6 @@ CPPSRCS = \
nsXULMenuAccessibleWrap.cpp \
nsXULListboxAccessibleWrap.cpp \
nsXULTreeGridAccessibleWrap.cpp \
nsHTMLTableAccessibleWrap.cpp \
nsWinUtils.cpp \
CAccessibleText.cpp \
CAccessibleEditableText.cpp \

74
accessible/src/msaa/nsHTMLTableAccessibleWrap.h
View File

@ -1,74 +0,0 @@
/* -*- 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 _NSHTMLTABLEACCESSIBLEWRAP_H
#define _NSHTMLTABLEACCESSIBLEWRAP_H
#include "nsHTMLTableAccessible.h"
#include "CAccessibleTable.h"
#include "CAccessibleTableCell.h"
/**
* IA2 wrapper class for nsHTMLTableAccessible implementing IAccessibleTable
* and IAccessibleTable2 interfaces.
*/
class nsHTMLTableAccessibleWrap : public nsHTMLTableAccessible,
public CAccessibleTable
{
public:
nsHTMLTableAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
nsHTMLTableAccessible(aContent, aDoc) {}
// IUnknown
DECL_IUNKNOWN_INHERITED
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
};
/**
* IA2 wrapper class for nsHTMLTableCellAccessible implementing
* IAccessibleTableCell interface.
*/
class nsHTMLTableCellAccessibleWrap : public nsHTMLTableCellAccessible,
public CAccessibleTableCell
{
public:
nsHTMLTableCellAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
nsHTMLTableCellAccessible(aContent, aDoc) {}
// IUnknown
DECL_IUNKNOWN_INHERITED
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
};
/**
* IA2 wrapper class for nsHTMLTableHeaderCellAccessible implementing
* IAccessibleTableCell interface.
*/
class nsHTMLTableHeaderCellAccessibleWrap : public nsHTMLTableHeaderCellAccessible,
public CAccessibleTableCell
{
public:
nsHTMLTableHeaderCellAccessibleWrap(nsIContent* aContent,
DocAccessible* aDoc) :
nsHTMLTableHeaderCellAccessible(aContent, aDoc) {}
// IUnknown
DECL_IUNKNOWN_INHERITED
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
};
#endif

24
accessible/src/other/HTMLTableAccessibleWrap.h Normal file
View File

@ -0,0 +1,24 @@
/* -*- 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_HTMLTableAccessibleWrap_h__
#define mozilla_a11y_HTMLTableAccessibleWrap_h__
#include "HTMLTableAccessible.h"
namespace mozilla {
namespace a11y {
typedef class HTMLTableAccessible HTMLTableAccessibleWrap;
typedef class HTMLTableCellAccessible HTMLTableCellAccessibleWrap;
typedef class HTMLTableHeaderCellAccessible HTMLTableHeaderCellAccessibleWrap;
} // namespace a11y
} // namespace mozilla
#endif

18
accessible/src/other/nsHTMLTableAccessibleWrap.h
View File

@ -1,18 +0,0 @@
/* -*- 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 _NSHTMLTABLEACCESSIBLEWRAP_H
#define _NSHTMLTABLEACCESSIBLEWRAP_H
#include "nsHTMLTableAccessible.h"
typedef class nsHTMLTableAccessible nsHTMLTableAccessibleWrap;
typedef class nsHTMLTableCellAccessible nsHTMLTableCellAccessibleWrap;
typedef class nsHTMLTableHeaderCellAccessible nsHTMLTableHeaderCellAccessibleWrap;
#endif

2
accessible/tests/mochitest/table/test_layoutguess.html
View File

@ -1,7 +1,7 @@
<html>
<!-- https://bugzilla.mozilla.org/show_bug.cgi?id=495388 -->
<head>
<title>test nsHTMLTableAccessible::IsProbablyForLayout implementation</title>
<title>test HTMLTableAccessible::IsProbablyForLayout implementation</title>
<link rel="stylesheet" type="text/css"
href="chrome://mochikit/content/tests/SimpleTest/test.css" />