Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 575989 - Reduce a11y compiler warnings. r=surkov

Browse Source
This commit is contained in:
David Bolter 2010-07-16 10:15:07 -04:00
parent 286d65ef70
commit 52aeaaa225
5 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
accessible/src/base/nsARIAGridAccessible.cpp
View File

@ -485,18 +485,18 @@ nsARIAGridAccessible::GetSelectedCells(nsIArray **aCells)
AccIterator rowIter(this, filters::GetRow);
nsAccessible *row = nsnull;
while (row = rowIter.GetNext()) {
while ((row = rowIter.GetNext())) {
AccIterator cellIter(row, filters::GetCell);
nsAccessible *cell = nsnull;
if (nsAccUtils::IsARIASelected(row)) {
while (cell = cellIter.GetNext())
while ((cell = cellIter.GetNext()))
selCells->AppendElement(static_cast<nsIAccessible *>(cell), PR_FALSE);
continue;
}
while (cell = cellIter.GetNext()) {
while ((cell = cellIter.GetNext())) {
if (nsAccUtils::IsARIASelected(cell))
selCells->AppendElement(static_cast<nsIAccessible *>(cell), PR_FALSE);
}
@ -529,7 +529,7 @@ nsARIAGridAccessible::GetSelectedCellIndices(PRUint32 *aCellsCount,
AccIterator rowIter(this, filters::GetRow);
nsAccessible *row = nsnull;
for (PRInt32 rowIdx = 0; row = rowIter.GetNext(); rowIdx++) {
for (PRInt32 rowIdx = 0; (row = rowIter.GetNext()); rowIdx++) {
if (nsAccUtils::IsARIASelected(row)) {
for (PRInt32 colIdx = 0; colIdx < colCount; colIdx++)
selCells.AppendElement(rowIdx * colCount + colIdx);
@ -540,7 +540,7 @@ nsARIAGridAccessible::GetSelectedCellIndices(PRUint32 *aCellsCount,
AccIterator cellIter(row, filters::GetCell);
nsAccessible *cell = nsnull;
for (PRInt32 colIdx = 0; cell = cellIter.GetNext(); colIdx++) {
for (PRInt32 colIdx = 0; (cell = cellIter.GetNext()); colIdx++) {
if (nsAccUtils::IsARIASelected(cell))
selCells.AppendElement(rowIdx * colCount + colIdx);
}
@ -589,7 +589,7 @@ nsARIAGridAccessible::GetSelectedRowIndices(PRUint32 *arowCount,
AccIterator rowIter(this, filters::GetRow);
nsAccessible *row = nsnull;
for (PRInt32 rowIdx = 0; row = rowIter.GetNext(); rowIdx++) {
for (PRInt32 rowIdx = 0; (row = rowIter.GetNext()); rowIdx++) {
if (nsAccUtils::IsARIASelected(row)) {
selRows.AppendElement(rowIdx);
continue;
@ -635,7 +635,7 @@ nsARIAGridAccessible::SelectRow(PRInt32 aRow)
AccIterator rowIter(this, filters::GetRow);
nsAccessible *row = nsnull;
for (PRInt32 rowIdx = 0; row = rowIter.GetNext(); rowIdx++) {
for (PRInt32 rowIdx = 0; (row = rowIter.GetNext()); rowIdx++) {
nsresult rv = SetARIASelected(row, rowIdx == aRow);
NS_ENSURE_SUCCESS(rv, rv);
}
@ -887,7 +887,7 @@ nsARIAGridAccessible::GetSelectedColumnsArray(PRUint32 *acolumnCount,
AccIterator cellIter(row, filters::GetCell);
nsAccessible *cell = nsnull;
for (colIdx = 0; cell = cellIter.GetNext(); colIdx++) {
for (colIdx = 0; (cell = cellIter.GetNext()); colIdx++) {
if (isColSelArray.SafeElementAt(colIdx, PR_FALSE) &&
!nsAccUtils::IsARIASelected(cell)) {
isColSelArray[colIdx] = PR_FALSE;

4
accessible/src/base/nsAccDocManager.cpp
View File

@ -1,4 +1,4 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
@ -546,8 +546,6 @@ nsAccDocManager::ClearDocCacheEntry(const void* aKey,
nsRefPtr<nsDocAccessible>& aDocAccessible,
void* aUserArg)
{
nsAccDocManager *accDocMgr = static_cast<nsAccDocManager*>(aUserArg);
NS_ASSERTION(aDocAccessible,
"Calling ClearDocCacheEntry with a NULL pointer!");

2
accessible/src/base/nsDocAccessible.cpp
View File

@ -91,7 +91,7 @@ nsDocAccessible::
nsDocAccessible(nsIDocument *aDocument, nsIContent *aRootContent,
nsIWeakReference *aShell) :
nsHyperTextAccessibleWrap(aRootContent, aShell), mWnd(nsnull),
mDocument(aDocument), mIsLoaded(PR_FALSE), mScrollPositionChangedTicks(0)
mDocument(aDocument), mScrollPositionChangedTicks(0), mIsLoaded(PR_FALSE)
{
// XXX aaronl should we use an algorithm for the initial cache size?
mAccessibleCache.Init(kDefaultCacheSize);

2
accessible/src/html/nsHyperTextAccessible.cpp
View File

@ -812,7 +812,7 @@ nsHyperTextAccessible::GetRelativeOffset(nsIPresShell *aPresShell,
// For line selection with needsStart, set start of line exactly to line break
if (pos.mContentOffset == 0 && firstChild &&
nsAccUtils::Role(firstChild) == nsIAccessibleRole::ROLE_STATICTEXT &&
nsAccUtils::TextLength(firstChild) == hyperTextOffset) {
static_cast<PRInt32>(nsAccUtils::TextLength(firstChild)) == hyperTextOffset) {
// XXX Bullet hack -- we should remove this once list bullets use anonymous content
hyperTextOffset = 0;
}

4
accessible/src/xul/nsXULTreeAccessible.cpp
View File

@ -662,8 +662,8 @@ nsXULTreeItemAccessibleBase::
nsXULTreeItemAccessibleBase(nsIContent *aContent, nsIWeakReference *aShell,
nsAccessible *aParent, nsITreeBoxObject *aTree,
nsITreeView *aTreeView, PRInt32 aRow) :
mTree(aTree), mTreeView(aTreeView), mRow(aRow),
nsAccessibleWrap(aContent, aShell)
nsAccessibleWrap(aContent, aShell),
mTree(aTree), mTreeView(aTreeView), mRow(aRow)
{
mParent = aParent;
}