Bug 1277131 : Part 1 - rename nsTableOuterFrame to nsTableWrapperFrame. r=heycam

MozReview-Commit-ID: KrSHLbmovTM
This commit is contained in:
Astley Chen
2016-06-16 13:14:08 +01:00
parent 82436c2b82
commit ca13d10ee9
25 changed files with 257 additions and 254 deletions

View File

@@ -34,7 +34,7 @@
#include "nsComponentManagerUtils.h"
#include "nsNameSpaceManager.h"
#include "nsTableCellFrame.h"
#include "nsTableOuterFrame.h"
#include "nsTableWrapperFrame.h"
using namespace mozilla;
using namespace mozilla::dom;
@@ -495,21 +495,21 @@ HTMLTableAccessible::Summary(nsString& aSummary)
uint32_t
HTMLTableAccessible::ColCount()
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
return tableFrame ? tableFrame->GetColCount() : 0;
}
uint32_t
HTMLTableAccessible::RowCount()
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
return tableFrame ? tableFrame->GetRowCount() : 0;
}
uint32_t
HTMLTableAccessible::SelectedCellCount()
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
return 0;
@@ -559,7 +559,7 @@ HTMLTableAccessible::SelectedRowCount()
void
HTMLTableAccessible::SelectedCells(nsTArray<Accessible*>* aCells)
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
return;
@@ -586,7 +586,7 @@ HTMLTableAccessible::SelectedCells(nsTArray<Accessible*>* aCells)
void
HTMLTableAccessible::SelectedCellIndices(nsTArray<uint32_t>* aCells)
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
return;
@@ -628,7 +628,7 @@ HTMLTableAccessible::SelectedRowIndices(nsTArray<uint32_t>* aRows)
Accessible*
HTMLTableAccessible::CellAt(uint32_t aRowIdx, uint32_t aColIdx)
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
return nullptr;
@@ -643,7 +643,7 @@ HTMLTableAccessible::CellAt(uint32_t aRowIdx, uint32_t aColIdx)
int32_t
HTMLTableAccessible::CellIndexAt(uint32_t aRowIdx, uint32_t aColIdx)
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
return -1;
@@ -653,7 +653,7 @@ HTMLTableAccessible::CellIndexAt(uint32_t aRowIdx, uint32_t aColIdx)
int32_t
HTMLTableAccessible::ColIndexAt(uint32_t aCellIdx)
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
return -1;
@@ -665,7 +665,7 @@ HTMLTableAccessible::ColIndexAt(uint32_t aCellIdx)
int32_t
HTMLTableAccessible::RowIndexAt(uint32_t aCellIdx)
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
return -1;
@@ -678,7 +678,7 @@ void
HTMLTableAccessible::RowAndColIndicesAt(uint32_t aCellIdx, int32_t* aRowIdx,
int32_t* aColIdx)
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (tableFrame)
tableFrame->GetRowAndColumnByIndex(aCellIdx, aRowIdx, aColIdx);
}
@@ -686,7 +686,7 @@ HTMLTableAccessible::RowAndColIndicesAt(uint32_t aCellIdx, int32_t* aRowIdx,
uint32_t
HTMLTableAccessible::ColExtentAt(uint32_t aRowIdx, uint32_t aColIdx)
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
return 0;
@@ -696,7 +696,7 @@ HTMLTableAccessible::ColExtentAt(uint32_t aRowIdx, uint32_t aColIdx)
uint32_t
HTMLTableAccessible::RowExtentAt(uint32_t aRowIdx, uint32_t aColIdx)
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
return 0;
@@ -736,7 +736,7 @@ HTMLTableAccessible::IsRowSelected(uint32_t aRowIdx)
bool
HTMLTableAccessible::IsCellSelected(uint32_t aRowIdx, uint32_t aColIdx)
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
return false;
@@ -791,7 +791,7 @@ HTMLTableAccessible::AddRowOrColumnToSelection(int32_t aIndex, uint32_t aTarget)
{
bool doSelectRow = (aTarget == nsISelectionPrivate::TABLESELECTION_ROW);
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
return NS_OK;
@@ -823,7 +823,7 @@ HTMLTableAccessible::RemoveRowsOrColumnsFromSelection(int32_t aIndex,
uint32_t aTarget,
bool aIsOuter)
{
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
return NS_OK;
@@ -1047,7 +1047,7 @@ HTMLTableAccessible::IsProbablyLayoutTable()
// Now we know there are 2-4 columns and 2 or more rows
// Check to see if there are visible borders on the cells
// XXX currently, we just check the first cell -- do we really need to do more?
nsTableOuterFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
nsTableWrapperFrame* tableFrame = do_QueryFrame(mContent->GetPrimaryFrame());
if (!tableFrame)
RETURN_LAYOUT_ANSWER(false, "table with no frame!");