diff options
| author | Moonchild <git-repo@palemoon.org> | 2020-02-17 12:40:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-17 12:40:36 +0100 |
| commit | a4ab3fc59dcd26d527716ae8ed23adf9148cb699 (patch) | |
| tree | f5c0845fac59471189d20e88617531dcdb1b79dd /accessible/html/HTMLTableAccessible.cpp | |
| parent | e8417acbff563634f11f25461d953b951caac056 (diff) | |
| parent | d4098037a4a6bee464fde4b70644e730e13b487f (diff) | |
| download | UXP-a4ab3fc59dcd26d527716ae8ed23adf9148cb699.tar UXP-a4ab3fc59dcd26d527716ae8ed23adf9148cb699.tar.gz UXP-a4ab3fc59dcd26d527716ae8ed23adf9148cb699.tar.lz UXP-a4ab3fc59dcd26d527716ae8ed23adf9148cb699.tar.xz UXP-a4ab3fc59dcd26d527716ae8ed23adf9148cb699.zip | |
Merge pull request #1447 from win7-7/optimization-4-pr
Speed up nsTableColFrame::GetColIndex
Diffstat (limited to 'accessible/html/HTMLTableAccessible.cpp')
| -rw-r--r-- | accessible/html/HTMLTableAccessible.cpp | 48 |
1 files changed, 21 insertions, 27 deletions
diff --git a/accessible/html/HTMLTableAccessible.cpp b/accessible/html/HTMLTableAccessible.cpp index b0cdc0932..af7dd561f 100644 --- a/accessible/html/HTMLTableAccessible.cpp +++ b/accessible/html/HTMLTableAccessible.cpp @@ -175,23 +175,17 @@ HTMLTableCellAccessible::Table() const uint32_t HTMLTableCellAccessible::ColIdx() const { - nsITableCellLayout* cellLayout = GetCellLayout(); - NS_ENSURE_TRUE(cellLayout, 0); - - int32_t colIdx = 0; - cellLayout->GetColIndex(colIdx); - return colIdx > 0 ? static_cast<uint32_t>(colIdx) : 0; + nsTableCellFrame* cellFrame = GetCellFrame(); + NS_ENSURE_TRUE(cellFrame, 0); + return cellFrame->ColIndex(); } uint32_t HTMLTableCellAccessible::RowIdx() const { - nsITableCellLayout* cellLayout = GetCellLayout(); - NS_ENSURE_TRUE(cellLayout, 0); - - int32_t rowIdx = 0; - cellLayout->GetRowIndex(rowIdx); - return rowIdx > 0 ? static_cast<uint32_t>(rowIdx) : 0; + nsTableCellFrame* cellFrame = GetCellFrame(); + NS_ENSURE_TRUE(cellFrame, 0); + return cellFrame->RowIndex(); } uint32_t @@ -285,6 +279,12 @@ HTMLTableCellAccessible::GetCellLayout() const return do_QueryFrame(mContent->GetPrimaryFrame()); } +nsTableCellFrame* +HTMLTableCellAccessible::GetCellFrame() const +{ + return do_QueryFrame(mContent->GetPrimaryFrame()); +} + nsresult HTMLTableCellAccessible::GetCellIndexes(int32_t& aRowIdx, int32_t& aColIdx) const { @@ -520,11 +520,9 @@ HTMLTableAccessible::SelectedCellCount() if (!cellFrame || !cellFrame->IsSelected()) continue; - int32_t startRow = -1, startCol = -1; - cellFrame->GetRowIndex(startRow); - cellFrame->GetColIndex(startCol); - if (startRow >= 0 && (uint32_t)startRow == rowIdx && - startCol >= 0 && (uint32_t)startCol == colIdx) + uint32_t startRow = cellFrame->RowIndex(); + uint32_t startCol = cellFrame->ColIndex(); + if (startRow == rowIdx && startCol == colIdx) count++; } } @@ -570,11 +568,9 @@ HTMLTableAccessible::SelectedCells(nsTArray<Accessible*>* aCells) if (!cellFrame || !cellFrame->IsSelected()) continue; - int32_t startCol = -1, startRow = -1; - cellFrame->GetRowIndex(startRow); - cellFrame->GetColIndex(startCol); - if ((startRow >= 0 && (uint32_t)startRow != rowIdx) || - (startCol >= 0 && (uint32_t)startCol != colIdx)) + uint32_t startRow = cellFrame->RowIndex(); + uint32_t startCol = cellFrame->ColIndex(); + if (startRow != rowIdx || startCol != colIdx) continue; Accessible* cell = mDoc->GetAccessible(cellFrame->GetContent()); @@ -597,11 +593,9 @@ HTMLTableAccessible::SelectedCellIndices(nsTArray<uint32_t>* aCells) if (!cellFrame || !cellFrame->IsSelected()) continue; - int32_t startRow = -1, startCol = -1; - cellFrame->GetColIndex(startCol); - cellFrame->GetRowIndex(startRow); - if (startRow >= 0 && (uint32_t)startRow == rowIdx && - startCol >= 0 && (uint32_t)startCol == colIdx) + uint32_t startCol = cellFrame->ColIndex(); + uint32_t startRow = cellFrame->RowIndex(); + if (startRow == rowIdx && startCol == colIdx) aCells->AppendElement(CellIndexAt(rowIdx, colIdx)); } } |