Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-22 02:09:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out 422c0104079e (bug 767272) for attributes/test_obj.html hangs

Browse Source
This commit is contained in:
Phil Ringnalda 2013-01-28 23:17:32 -08:00
parent 2fc5d2813d
commit d47cb00287
10 changed files with 393 additions and 308 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accessible/src/msaa/ARIAGridAccessibleWrap.cpp
View File

@ -21,12 +21,6 @@ IMPL_IUNKNOWN_INHERITED1(ARIAGridAccessibleWrap,
AccessibleWrap,
ia2AccessibleTable)
void
ARIAGridAccessibleWrap::Shutdown()
{
ia2AccessibleTable::mTable = nullptr;
ARIAGridAccessible::Shutdown();
}
////////////////////////////////////////////////////////////////////////////////
// ARIAGridCellAccessibleWrap

4
accessible/src/msaa/ARIAGridAccessibleWrap.h
View File

@ -24,15 +24,13 @@ class ARIAGridAccessibleWrap : public ARIAGridAccessible,
{
public:
ARIAGridAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
ARIAGridAccessible(aContent, aDoc), ia2AccessibleTable(this) {}
ARIAGridAccessible(aContent, aDoc) {}
// IUnknown
DECL_IUNKNOWN_INHERITED
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
};
/**

6
accessible/src/msaa/HTMLTableAccessibleWrap.cpp
View File

@ -20,12 +20,6 @@ IMPL_IUNKNOWN_INHERITED1(HTMLTableAccessibleWrap,
AccessibleWrap,
ia2AccessibleTable)
void
HTMLTableAccessibleWrap::Shutdown()
{
ia2AccessibleTable::mTable = nullptr;
HTMLTableAccessible::Shutdown();
}
////////////////////////////////////////////////////////////////////////////////
// HTMLTableCellAccessibleWrap

4
accessible/src/msaa/HTMLTableAccessibleWrap.h
View File

@ -25,15 +25,13 @@ class HTMLTableAccessibleWrap : public HTMLTableAccessible,
{
public:
HTMLTableAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
HTMLTableAccessible(aContent, aDoc), ia2AccessibleTable(this) {}
HTMLTableAccessible(aContent, aDoc) {}
// IUnknown
DECL_IUNKNOWN_INHERITED
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
};

12
accessible/src/msaa/XULListboxAccessibleWrap.cpp
View File

@ -11,6 +11,12 @@ using namespace mozilla::a11y;
// XULListboxAccessibleWrap
////////////////////////////////////////////////////////////////////////////////
XULListboxAccessibleWrap::
XULListboxAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
XULListboxAccessible(aContent, aDoc)
{
}
NS_IMPL_ISUPPORTS_INHERITED0(XULListboxAccessibleWrap,
XULListboxAccessible)
@ -19,12 +25,6 @@ IMPL_IUNKNOWN_QUERY_CLASS_COND(ia2AccessibleTable, IsMulticolumn());
IMPL_IUNKNOWN_QUERY_CLASS(AccessibleWrap)
IMPL_IUNKNOWN_QUERY_TAIL
void
XULListboxAccessibleWrap::Shutdown()
{
ia2AccessibleTable::mTable = nullptr;
XULListboxAccessible::Shutdown();
}
////////////////////////////////////////////////////////////////////////////////
// XULListCellAccessibleWrap

5
accessible/src/msaa/XULListboxAccessibleWrap.h
View File

@ -22,16 +22,13 @@ class XULListboxAccessibleWrap : public XULListboxAccessible,
public ia2AccessibleTable
{
public:
XULListboxAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
XULListboxAccessible(aContent, aDoc), ia2AccessibleTable(this) {}
XULListboxAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc);
// IUnknown
DECL_IUNKNOWN_INHERITED
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
};
/**

12
accessible/src/msaa/XULTreeGridAccessibleWrap.cpp
View File

@ -11,6 +11,12 @@ using namespace mozilla::a11y;
// XULTreeGridAccessibleWrap
////////////////////////////////////////////////////////////////////////////////
XULTreeGridAccessibleWrap::
XULTreeGridAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
XULTreeGridAccessible(aContent, aDoc)
{
}
NS_IMPL_ISUPPORTS_INHERITED0(XULTreeGridAccessibleWrap,
XULTreeGridAccessible)
@ -18,12 +24,6 @@ IMPL_IUNKNOWN_INHERITED1(XULTreeGridAccessibleWrap,
AccessibleWrap,
ia2AccessibleTable)
void
XULTreeGridAccessibleWrap::Shutdown()
{
ia2AccessibleTable::mTable = nullptr;
XULTreeGridAccessibleWrap::Shutdown();
}
////////////////////////////////////////////////////////////////////////////////
// XULTreeGridCellAccessibleWrap

5
accessible/src/msaa/XULTreeGridAccessibleWrap.h
View File

@ -22,16 +22,13 @@ class XULTreeGridAccessibleWrap : public XULTreeGridAccessible,
public ia2AccessibleTable
{
public:
XULTreeGridAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
XULTreeGridAccessible(aContent, aDoc), ia2AccessibleTable(this) {}
XULTreeGridAccessibleWrap(nsIContent* aContent, DocAccessible* aDoc);
// IUnknown
DECL_IUNKNOWN_INHERITED
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
virtual void Shutdown() MOZ_OVERRIDE;
};
/**

624
accessible/src/windows/ia2/ia2AccessibleTable.cpp
View File

@ -11,15 +11,21 @@
#include "AccessibleTable_i.c"
#include "AccessibleTable2_i.c"
#include "AccessibleWrap.h"
#include "nsIAccessible.h"
#include "nsIAccessibleTable.h"
#include "nsIWinAccessNode.h"
#include "nsAccessNodeWrap.h"
#include "nsWinUtils.h"
#include "Statistics.h"
#include "TableAccessible.h"
#include "nsCOMPtr.h"
#include "nsString.h"
using namespace mozilla::a11y;
#define CANT_QUERY_ASSERTION_MSG \
"Subclass of ia2AccessibleTable doesn't implement nsIAccessibleTable"\
// IUnknown
STDMETHODIMP
@ -47,10 +53,36 @@ ia2AccessibleTable::QueryInterface(REFIID iid, void** ppv)
// IAccessibleTable
STDMETHODIMP
ia2AccessibleTable::get_accessibleAt(long aRowIdx, long aColIdx,
IUnknown** aAccessible)
ia2AccessibleTable::get_accessibleAt(long aRow, long aColumn,
IUnknown **aAccessible)
{
return get_cellAt(aRowIdx, aColIdx, aAccessible);
A11Y_TRYBLOCK_BEGIN
*aAccessible = NULL;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
nsCOMPtr<nsIAccessible> cell;
nsresult rv = tableAcc->GetCellAt(aRow, aColumn, getter_AddRefs(cell));
if (NS_FAILED(rv))
return GetHRESULT(rv);
nsCOMPtr<nsIWinAccessNode> winAccessNode(do_QueryInterface(cell));
if (!winAccessNode)
return E_FAIL;
void *instancePtr = NULL;
rv = winAccessNode->QueryNativeInterface(IID_IAccessible2, &instancePtr);
if (NS_FAILED(rv))
return E_FAIL;
*aAccessible = static_cast<IUnknown*>(instancePtr);
return S_OK;
A11Y_TRYBLOCK_END
}
STDMETHODIMP
@ -59,54 +91,76 @@ ia2AccessibleTable::get_caption(IUnknown** aAccessible)
A11Y_TRYBLOCK_BEGIN
*aAccessible = NULL;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
AccessibleWrap* caption = static_cast<AccessibleWrap*>(mTable->Caption());
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
nsCOMPtr<nsIAccessible> caption;
nsresult rv = tableAcc->GetCaption(getter_AddRefs(caption));
if (NS_FAILED(rv))
return GetHRESULT(rv);
if (!caption)
return S_FALSE;
(*aAccessible = static_cast<IAccessible*>(caption))->AddRef();
nsCOMPtr<nsIWinAccessNode> winAccessNode(do_QueryInterface(caption));
if (!winAccessNode)
return E_FAIL;
void *instancePtr = NULL;
rv = winAccessNode->QueryNativeInterface(IID_IAccessible2, &instancePtr);
if (NS_FAILED(rv))
return E_FAIL;
*aAccessible = static_cast<IUnknown*>(instancePtr);
return S_OK;
A11Y_TRYBLOCK_END
}
STDMETHODIMP
ia2AccessibleTable::get_childIndex(long aRowIdx, long aColIdx,
long* aChildIdx)
ia2AccessibleTable::get_childIndex(long aRowIndex, long aColumnIndex,
long* aChildIndex)
{
A11Y_TRYBLOCK_BEGIN
*aChildIdx = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
*aChildIndex = 0;
if (aRowIdx < 0 || aColIdx < 0 ||
static_cast<uint32_t>(aRowIdx) >= mTable->RowCount() ||
static_cast<uint32_t>(aColIdx) >= mTable->ColCount())
return E_INVALIDARG;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
*aChildIdx = mTable->CellIndexAt(aRowIdx, aColIdx);
int32_t childIndex = 0;
nsresult rv = tableAcc->GetCellIndexAt(aRowIndex, aColumnIndex, &childIndex);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aChildIndex = childIndex;
return S_OK;
A11Y_TRYBLOCK_END
}
STDMETHODIMP
ia2AccessibleTable::get_columnDescription(long aColIdx, BSTR* aDescription)
ia2AccessibleTable::get_columnDescription(long aColumn, BSTR* aDescription)
{
A11Y_TRYBLOCK_BEGIN
*aDescription = NULL;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
if (aColIdx < 0 || static_cast<uint32_t>(aColIdx) >= mTable->ColCount())
return E_INVALIDARG;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
nsAutoString descr;
mTable->ColDescription(aColIdx, descr);
nsresult rv = tableAcc->GetColumnDescription (aColumn, descr);
if (NS_FAILED(rv))
return GetHRESULT(rv);
if (descr.IsEmpty())
return S_FALSE;
@ -117,21 +171,24 @@ ia2AccessibleTable::get_columnDescription(long aColIdx, BSTR* aDescription)
}
STDMETHODIMP
ia2AccessibleTable::get_columnExtentAt(long aRowIdx, long aColIdx,
long* aSpan)
ia2AccessibleTable::get_columnExtentAt(long aRow, long aColumn,
long* nColumnsSpanned)
{
A11Y_TRYBLOCK_BEGIN
*aSpan = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
*nColumnsSpanned = 0;
if (aRowIdx < 0 || aColIdx < 0 ||
static_cast<uint32_t>(aRowIdx) >= mTable->RowCount() ||
static_cast<uint32_t>(aColIdx) >= mTable->ColCount())
return E_INVALIDARG;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
*aSpan = mTable->ColExtentAt(aRowIdx, aColIdx);
int32_t columnsSpanned = 0;
nsresult rv = tableAcc->GetColumnExtentAt(aRow, aColumn, &columnsSpanned);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*nColumnsSpanned = columnsSpanned;
return S_OK;
A11Y_TRYBLOCK_END
@ -151,34 +208,46 @@ ia2AccessibleTable::get_columnHeader(IAccessibleTable** aAccessibleTable,
}
STDMETHODIMP
ia2AccessibleTable::get_columnIndex(long aCellIdx, long* aColIdx)
ia2AccessibleTable::get_columnIndex(long aChildIndex, long* aColumnIndex)
{
A11Y_TRYBLOCK_BEGIN
*aColIdx = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
*aColumnIndex = 0;
if (aCellIdx < 0 ||
static_cast<uint32_t>(aCellIdx) >= mTable->ColCount() * mTable->RowCount())
return E_INVALIDARG;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
*aColIdx = mTable->ColIndexAt(aCellIdx);
int32_t columnIndex = 0;
nsresult rv = tableAcc->GetColumnIndexAt(aChildIndex, &columnIndex);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aColumnIndex = columnIndex;
return S_OK;
A11Y_TRYBLOCK_END
}
STDMETHODIMP
ia2AccessibleTable::get_nColumns(long* aColCount)
ia2AccessibleTable::get_nColumns(long* aColumnCount)
{
A11Y_TRYBLOCK_BEGIN
*aColCount = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
*aColumnCount = 0;
*aColCount = mTable->ColCount();
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
int32_t columnCount = 0;
nsresult rv = tableAcc->GetColumnCount(&columnCount);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aColumnCount = columnCount;
return S_OK;
A11Y_TRYBLOCK_END
@ -190,10 +259,18 @@ ia2AccessibleTable::get_nRows(long* aRowCount)
A11Y_TRYBLOCK_BEGIN
*aRowCount = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
*aRowCount = mTable->RowCount();
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
int32_t rowCount = 0;
nsresult rv = tableAcc->GetRowCount(&rowCount);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aRowCount = rowCount;
return S_OK;
A11Y_TRYBLOCK_END
@ -202,19 +279,44 @@ ia2AccessibleTable::get_nRows(long* aRowCount)
STDMETHODIMP
ia2AccessibleTable::get_nSelectedChildren(long* aChildCount)
{
return get_nSelectedCells(aChildCount);
A11Y_TRYBLOCK_BEGIN
*aChildCount = 0;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
uint32_t count = 0;
nsresult rv = tableAcc->GetSelectedCellCount(&count);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aChildCount = count;
return S_OK;
A11Y_TRYBLOCK_END
}
STDMETHODIMP
ia2AccessibleTable::get_nSelectedColumns(long* aColCount)
ia2AccessibleTable::get_nSelectedColumns(long* aColumnCount)
{
A11Y_TRYBLOCK_BEGIN
*aColCount = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
*aColumnCount = 0;
*aColCount = mTable->SelectedColCount();
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
uint32_t count = 0;
nsresult rv = tableAcc->GetSelectedColumnCount(&count);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aColumnCount = count;
return S_OK;
A11Y_TRYBLOCK_END
@ -226,30 +328,40 @@ ia2AccessibleTable::get_nSelectedRows(long* aRowCount)
A11Y_TRYBLOCK_BEGIN
*aRowCount = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
*aRowCount = mTable->SelectedRowCount();
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
uint32_t count = 0;
nsresult rv = tableAcc->GetSelectedRowCount(&count);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aRowCount = count;
return S_OK;
A11Y_TRYBLOCK_END
}
STDMETHODIMP
ia2AccessibleTable::get_rowDescription(long aRowIdx, BSTR* aDescription)
ia2AccessibleTable::get_rowDescription(long aRow, BSTR* aDescription)
{
A11Y_TRYBLOCK_BEGIN
*aDescription = NULL;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
if (aRowIdx < 0 || static_cast<uint32_t>(aRowIdx) >= mTable->RowCount())
return E_INVALIDARG;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
nsAutoString descr;
mTable->RowDescription(aRowIdx, descr);
nsresult rv = tableAcc->GetRowDescription (aRow, descr);
if (NS_FAILED(rv))
return GetHRESULT(rv);
if (descr.IsEmpty())
return S_FALSE;
@ -260,20 +372,24 @@ ia2AccessibleTable::get_rowDescription(long aRowIdx, BSTR* aDescription)
}
STDMETHODIMP
ia2AccessibleTable::get_rowExtentAt(long aRowIdx, long aColIdx, long* aSpan)
ia2AccessibleTable::get_rowExtentAt(long aRow, long aColumn,
long* aNRowsSpanned)
{
A11Y_TRYBLOCK_BEGIN
*aSpan = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
*aNRowsSpanned = 0;
if (aRowIdx < 0 || aColIdx < 0 ||
static_cast<uint32_t>(aRowIdx) >= mTable->RowCount() ||
static_cast<uint32_t>(aColIdx) >= mTable->ColCount())
return E_INVALIDARG;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
*aSpan = mTable->RowExtentAt(aRowIdx, aColIdx);
int32_t rowsSpanned = 0;
nsresult rv = tableAcc->GetRowExtentAt(aRow, aColumn, &rowsSpanned);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aNRowsSpanned = rowsSpanned;
return S_OK;
A11Y_TRYBLOCK_END
@ -293,19 +409,23 @@ ia2AccessibleTable::get_rowHeader(IAccessibleTable** aAccessibleTable,
}
STDMETHODIMP
ia2AccessibleTable::get_rowIndex(long aCellIdx, long* aRowIdx)
ia2AccessibleTable::get_rowIndex(long aChildIndex, long* aRowIndex)
{
A11Y_TRYBLOCK_BEGIN
*aRowIdx = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
*aRowIndex = 0;
if (aCellIdx < 0 ||
static_cast<uint32_t>(aCellIdx) >= mTable->ColCount() * mTable->RowCount())
return E_INVALIDARG;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
*aRowIdx = mTable->RowIndexAt(aCellIdx);
int32_t rowIndex = 0;
nsresult rv = tableAcc->GetRowIndexAt(aChildIndex, &rowIndex);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aRowIndex = rowIndex;
return S_OK;
A11Y_TRYBLOCK_END
@ -317,24 +437,7 @@ ia2AccessibleTable::get_selectedChildren(long aMaxChildren, long** aChildren,
{
A11Y_TRYBLOCK_BEGIN
*aChildren = NULL;
*aNChildren = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
nsAutoTArray<uint32_t, 30> cellIndices;
mTable->SelectedCellIndices(&cellIndices);
uint32_t maxCells = cellIndices.Length();
if (maxCells == 0)
return S_FALSE;
*aChildren = static_cast<LONG*>(moz_xmalloc(sizeof(LONG) * maxCells));
*aNChildren = maxCells;
for (uint32_t i = 0; i < maxCells; i++)
*aChildren[i] = cellIndices[i];
return S_OK;
return GetSelectedItems(aChildren, aNChildren, ITEMSTYPE_CELLS);
A11Y_TRYBLOCK_END
}
@ -345,7 +448,7 @@ ia2AccessibleTable::get_selectedColumns(long aMaxColumns, long** aColumns,
{
A11Y_TRYBLOCK_BEGIN
return get_selectedColumns(aColumns, aNColumns);
return GetSelectedItems(aColumns, aNColumns, ITEMSTYPE_COLUMNS);
A11Y_TRYBLOCK_END
}
@ -355,7 +458,7 @@ ia2AccessibleTable::get_selectedRows(long aMaxRows, long** aRows, long* aNRows)
{
A11Y_TRYBLOCK_BEGIN
return get_selectedRows(aRows, aNRows);
return GetSelectedItems(aRows, aNRows, ITEMSTYPE_ROWS);
A11Y_TRYBLOCK_END
}
@ -377,159 +480,182 @@ ia2AccessibleTable::get_summary(IUnknown** aAccessible)
}
STDMETHODIMP
ia2AccessibleTable::get_isColumnSelected(long aColIdx, boolean* aIsSelected)
ia2AccessibleTable::get_isColumnSelected(long aColumn, boolean* aIsSelected)
{
A11Y_TRYBLOCK_BEGIN
*aIsSelected = false;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
if (aColIdx < 0 || static_cast<uint32_t>(aColIdx) >= mTable->ColCount())
return E_INVALIDARG;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
*aIsSelected = mTable->IsColSelected(aColIdx);
bool isSelected = false;
nsresult rv = tableAcc->IsColumnSelected(aColumn, &isSelected);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aIsSelected = isSelected;
return S_OK;
A11Y_TRYBLOCK_END
}
STDMETHODIMP
ia2AccessibleTable::get_isRowSelected(long aRowIdx, boolean* aIsSelected)
ia2AccessibleTable::get_isRowSelected(long aRow, boolean* aIsSelected)
{
A11Y_TRYBLOCK_BEGIN
*aIsSelected = false;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
if (aRowIdx < 0 || static_cast<uint32_t>(aRowIdx) >= mTable->RowCount())
return E_INVALIDARG;
bool isSelected = false;
nsresult rv = tableAcc->IsRowSelected(aRow, &isSelected);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aIsSelected = mTable->IsRowSelected(aRowIdx);
*aIsSelected = isSelected;
return S_OK;
A11Y_TRYBLOCK_END
}
STDMETHODIMP
ia2AccessibleTable::get_isSelected(long aRowIdx, long aColIdx,
ia2AccessibleTable::get_isSelected(long aRow, long aColumn,
boolean* aIsSelected)
{
A11Y_TRYBLOCK_BEGIN
*aIsSelected = false;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
if (aRowIdx < 0 || aColIdx < 0 ||
static_cast<uint32_t>(aColIdx) >= mTable->ColCount() ||
static_cast<uint32_t>(aRowIdx) >= mTable->RowCount())
return E_INVALIDARG;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
*aIsSelected = mTable->IsCellSelected(aRowIdx, aColIdx);
bool isSelected = false;
nsresult rv = tableAcc->IsCellSelected(aRow, aColumn, &isSelected);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aIsSelected = isSelected;
return S_OK;
A11Y_TRYBLOCK_END
}
STDMETHODIMP
ia2AccessibleTable::selectRow(long aRowIdx)
ia2AccessibleTable::selectRow(long aRow)
{
A11Y_TRYBLOCK_BEGIN
if (!mTable)
return CO_E_OBJNOTCONNECTED;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
if (aRowIdx < 0 || static_cast<uint32_t>(aRowIdx) >= mTable->RowCount())
return E_INVALIDARG;
mTable->SelectRow(aRowIdx);
return S_OK;
nsresult rv = tableAcc->SelectRow(aRow);
return GetHRESULT(rv);
A11Y_TRYBLOCK_END
}
STDMETHODIMP
ia2AccessibleTable::selectColumn(long aColIdx)
ia2AccessibleTable::selectColumn(long aColumn)
{
A11Y_TRYBLOCK_BEGIN
if (!mTable)
return CO_E_OBJNOTCONNECTED;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
if (aColIdx < 0 || static_cast<uint32_t>(aColIdx) >= mTable->ColCount())
return E_INVALIDARG;
mTable->SelectCol(aColIdx);
return S_OK;
nsresult rv = tableAcc->SelectColumn(aColumn);
return GetHRESULT(rv);
A11Y_TRYBLOCK_END
}
STDMETHODIMP
ia2AccessibleTable::unselectRow(long aRowIdx)
ia2AccessibleTable::unselectRow(long aRow)
{
A11Y_TRYBLOCK_BEGIN
if (!mTable)
return CO_E_OBJNOTCONNECTED;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
if (aRowIdx < 0 || static_cast<uint32_t>(aRowIdx) >= mTable->RowCount())
return E_INVALIDARG;
mTable->UnselectRow(aRowIdx);
return S_OK;
nsresult rv = tableAcc->UnselectRow(aRow);
return GetHRESULT(rv);
A11Y_TRYBLOCK_END
}
STDMETHODIMP
ia2AccessibleTable::unselectColumn(long aColIdx)
ia2AccessibleTable::unselectColumn(long aColumn)
{
A11Y_TRYBLOCK_BEGIN
if (!mTable)
return CO_E_OBJNOTCONNECTED;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
if (aColIdx < 0 || static_cast<uint32_t>(aColIdx) >= mTable->ColCount())
return E_INVALIDARG;
mTable->UnselectCol(aColIdx);
return S_OK;
nsresult rv = tableAcc->UnselectColumn(aColumn);
return GetHRESULT(rv);
A11Y_TRYBLOCK_END
}
STDMETHODIMP
ia2AccessibleTable::get_rowColumnExtentsAtIndex(long aCellIdx, long* aRowIdx,
long* aColIdx,
ia2AccessibleTable::get_rowColumnExtentsAtIndex(long aIndex, long* aRow,
long* aColumn,
long* aRowExtents,
long* aColExtents,
long* aColumnExtents,
boolean* aIsSelected)
{
A11Y_TRYBLOCK_BEGIN
*aRowIdx = 0;
*aColIdx = 0;
*aRow = 0;
*aColumn = 0;
*aRowExtents = 0;
*aColExtents = 0;
*aColumnExtents = 0;
*aIsSelected = false;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
if (aCellIdx < 0 ||
static_cast<uint32_t>(aCellIdx) >= mTable->ColCount() * mTable->RowCount())
return E_INVALIDARG;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
int32_t colIdx = 0, rowIdx = 0;
mTable->RowAndColIndicesAt(aCellIdx, &rowIdx, &colIdx);
*aRowIdx = rowIdx;
*aColIdx = colIdx;
*aRowExtents = mTable->RowExtentAt(rowIdx, colIdx);
*aColExtents = mTable->ColExtentAt(rowIdx, colIdx);
*aIsSelected = mTable->IsCellSelected(rowIdx, colIdx);
int32_t rowIdx = -1, columnIdx = -1;
nsresult rv = tableAcc->GetRowAndColumnIndicesAt(aIndex, &rowIdx, &columnIdx);
if (NS_FAILED(rv))
return GetHRESULT(rv);
int32_t rowExtents = 0;
rv = tableAcc->GetRowExtentAt(rowIdx, columnIdx, &rowExtents);
if (NS_FAILED(rv))
return GetHRESULT(rv);
int32_t columnExtents = 0;
rv = tableAcc->GetColumnExtentAt(rowIdx, columnIdx, &columnExtents);
if (NS_FAILED(rv))
return GetHRESULT(rv);
bool isSelected = false;
rv = tableAcc->IsCellSelected(rowIdx, columnIdx, &isSelected);
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aRow = rowIdx;
*aColumn = columnIdx;
*aRowExtents = rowExtents;
*aColumnExtents = columnExtents;
*aIsSelected = isSelected;
return S_OK;
A11Y_TRYBLOCK_END
@ -545,39 +671,15 @@ ia2AccessibleTable::get_modelChange(IA2TableModelChange* aModelChange)
// IAccessibleTable2
STDMETHODIMP
ia2AccessibleTable::get_cellAt(long aRowIdx, long aColIdx, IUnknown** aCell)
ia2AccessibleTable::get_cellAt(long aRow, long aColumn, IUnknown** aCell)
{
A11Y_TRYBLOCK_BEGIN
*aCell = NULL;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
AccessibleWrap* cell =
static_cast<AccessibleWrap*>(mTable->CellAt(aRowIdx, aColIdx));
if (!cell)
return E_INVALIDARG;
(*aCell = static_cast<IAccessible*>(cell))->AddRef();
return S_OK;
A11Y_TRYBLOCK_END
return get_accessibleAt(aRow, aColumn, aCell);
}
STDMETHODIMP
ia2AccessibleTable::get_nSelectedCells(long* aCellCount)
{
A11Y_TRYBLOCK_BEGIN
*aCellCount = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
*aCellCount = mTable->SelectedCellCount();
return S_OK;
A11Y_TRYBLOCK_END
return get_nSelectedChildren(aCellCount);
}
STDMETHODIMP
@ -585,30 +687,17 @@ ia2AccessibleTable::get_selectedCells(IUnknown*** aCells, long* aNSelectedCells)
{
A11Y_TRYBLOCK_BEGIN
*aCells = NULL;
*aNSelectedCells = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
nsAutoTArray<Accessible*, 30> cells;
mTable->SelectedCells(&cells);
if (cells.IsEmpty())
return S_FALSE;
nsCOMPtr<nsIArray> geckoCells;
nsresult rv = tableAcc->GetSelectedCells(getter_AddRefs(geckoCells));
if (NS_FAILED(rv))
return GetHRESULT(rv);
*aCells =
static_cast<IUnknown**>(::CoTaskMemAlloc(sizeof(IUnknown*) *
cells.Length()));
if (!*aCells)
return E_OUTOFMEMORY;
for (uint32_t i = 0; i < cells.Length(); i++) {
*aCells[i] =
static_cast<IAccessible*>(static_cast<AccessibleWrap*>(cells[i]));
(*aCells[i])->AddRef();
}
*aNSelectedCells = cells.Length();
return S_OK;
return nsWinUtils::ConvertToIA2Array(geckoCells, aCells, aNSelectedCells);
A11Y_TRYBLOCK_END
}
@ -618,24 +707,7 @@ ia2AccessibleTable::get_selectedColumns(long** aColumns, long* aNColumns)
{
A11Y_TRYBLOCK_BEGIN
*aColumns = NULL;
*aNColumns = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
nsAutoTArray<uint32_t, 30> colIndices;
mTable->SelectedColIndices(&colIndices);
uint32_t maxCols = colIndices.Length();
if (maxCols == 0)
return S_FALSE;
*aColumns = static_cast<LONG*>(moz_xmalloc(sizeof(LONG) * maxCols));
*aNColumns = maxCols;
for (uint32_t i = 0; i < maxCols; i++)
*aColumns[i] = colIndices[i];
return S_OK;
return GetSelectedItems(aColumns, aNColumns, ITEMSTYPE_COLUMNS);
A11Y_TRYBLOCK_END
}
@ -645,24 +717,58 @@ ia2AccessibleTable::get_selectedRows(long** aRows, long* aNRows)
{
A11Y_TRYBLOCK_BEGIN
*aRows = NULL;
*aNRows = 0;
if (!mTable)
return CO_E_OBJNOTCONNECTED;
nsAutoTArray<uint32_t, 30> rowIndices;
mTable->SelectedRowIndices(&rowIndices);
uint32_t maxRows = rowIndices.Length();
if (maxRows == 0)
return S_FALSE;
*aRows = static_cast<LONG*>(moz_xmalloc(sizeof(LONG) * maxRows));
*aNRows = maxRows;
for (uint32_t i = 0; i < maxRows; i++)
*aRows[i] = rowIndices[i];
return S_OK;
return GetSelectedItems(aRows, aNRows, ITEMSTYPE_ROWS);
A11Y_TRYBLOCK_END
}
////////////////////////////////////////////////////////////////////////////////
// ia2AccessibleTable public
HRESULT
ia2AccessibleTable::GetSelectedItems(long** aItems, long* aItemsCount,
eItemsType aType)
{
*aItemsCount = 0;
nsCOMPtr<nsIAccessibleTable> tableAcc(do_QueryObject(this));
NS_ASSERTION(tableAcc, CANT_QUERY_ASSERTION_MSG);
if (!tableAcc)
return E_FAIL;
uint32_t size = 0;
int32_t *items = nullptr;
nsresult rv = NS_OK;
switch (aType) {
case ITEMSTYPE_CELLS:
rv = tableAcc->GetSelectedCellIndices(&size, &items);
break;
case ITEMSTYPE_COLUMNS:
rv = tableAcc->GetSelectedColumnIndices(&size, &items);
break;
case ITEMSTYPE_ROWS:
rv = tableAcc->GetSelectedRowIndices(&size, &items);
break;
default:
return E_FAIL;
}
if (NS_FAILED(rv))
return GetHRESULT(rv);
if (size == 0 || !items)
return S_FALSE;
*aItems = static_cast<long*>(nsMemory::Alloc((size) * sizeof(long)));
if (!*aItems)
return E_OUTOFMEMORY;
*aItemsCount = size;
for (uint32_t index = 0; index < size; ++index)
(*aItems)[index] = items[index];
nsMemory::Free(items);
return S_OK;
}

23
accessible/src/windows/ia2/ia2AccessibleTable.h
View File

@ -8,14 +8,11 @@
#ifndef _ACCESSIBLE_TABLE_H
#define _ACCESSIBLE_TABLE_H
#include "nsISupports.h"
#include "AccessibleTable.h"
#include "AccessibleTable2.h"
namespace mozilla {
namespace a11y {
class TableAccessible;
class ia2AccessibleTable : public IAccessibleTable,
public IAccessibleTable2
{
@ -164,13 +161,17 @@ public:
/* [out, size_is(,*nRows)] */ long **selectedRows,
/* [out, retval] */ long *nRows);
protected:
ia2AccessibleTable(TableAccessible* aTable) : mTable(aTable) {}
// nsISupports
NS_IMETHOD QueryInterface(const nsIID& uuid, void** result) = 0;
TableAccessible* mTable;
private:
enum eItemsType {
ITEMSTYPE_CELLS,
ITEMSTYPE_COLUMNS,
ITEMSTYPE_ROWS
};
HRESULT GetSelectedItems(long **aItems, long *aItemsCount, eItemsType aType);
};
} // namespace a11y
} // namespace mozilla
#endif