Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1466727 part 2. Remove use of nsITreeColumn in xpidl interfaces. r=mossop

Browse Source 
There is one actual behavior change here, in the webidl version of
TreeBoxObject::GetCellAt.  I believe this change fixes a leak of the
nsTreeColumn, but could use careful review.

I tried to avoid changes not needed to get this compiling.  There will be a lot
more cleanup in the next few changesets.
This commit is contained in:
Boris Zbarsky 2018-06-05 23:01:36 -04:00
parent 67d5a3d8ba
commit 3473c823b2
26 changed files with 170 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
accessible/base/nsCoreUtils.cpp
View File

@ -70,7 +70,7 @@ nsCoreUtils::HasClickListener(nsIContent *aContent)
void
nsCoreUtils::DispatchClickEvent(nsITreeBoxObject *aTreeBoxObj,
int32_t aRowIndex, nsITreeColumn *aColumn,
int32_t aRowIndex, nsTreeColumn *aColumn,
const nsAString& aPseudoElt)
{
RefPtr<dom::Element> tcElm;
@ -519,7 +519,7 @@ nsCoreUtils::GetTreeBoxObject(nsIContent *aContent)
return nullptr;
}
already_AddRefed<nsITreeColumn>
already_AddRefed<nsTreeColumn>
nsCoreUtils::GetFirstSensibleColumn(nsITreeBoxObject *aTree)
{
RefPtr<nsTreeColumns> cols;
@ -556,12 +556,12 @@ nsCoreUtils::GetSensibleColumnCount(nsITreeBoxObject *aTree)
return count;
}
already_AddRefed<nsITreeColumn>
already_AddRefed<nsTreeColumn>
nsCoreUtils::GetSensibleColumnAt(nsITreeBoxObject *aTree, uint32_t aIndex)
{
uint32_t idx = aIndex;
nsCOMPtr<nsITreeColumn> column = GetFirstSensibleColumn(aTree);
nsCOMPtr<nsTreeColumn> column = GetFirstSensibleColumn(aTree);
while (column) {
if (idx == 0)
return column.forget();
@ -573,31 +573,27 @@ nsCoreUtils::GetSensibleColumnAt(nsITreeBoxObject *aTree, uint32_t aIndex)
return nullptr;
}
already_AddRefed<nsITreeColumn>
already_AddRefed<nsTreeColumn>
nsCoreUtils::GetNextSensibleColumn(nsITreeColumn *aColumn)
{
nsCOMPtr<nsITreeColumn> nextColumn;
RefPtr<nsTreeColumn> nextColumn;
aColumn->GetNext(getter_AddRefs(nextColumn));
while (nextColumn && IsColumnHidden(nextColumn)) {
nsCOMPtr<nsITreeColumn> tempColumn;
nextColumn->GetNext(getter_AddRefs(tempColumn));
nextColumn.swap(tempColumn);
nextColumn = nextColumn->GetNext();
}
return nextColumn.forget();
}
already_AddRefed<nsITreeColumn>
already_AddRefed<nsTreeColumn>
nsCoreUtils::GetPreviousSensibleColumn(nsITreeColumn *aColumn)
{
nsCOMPtr<nsITreeColumn> prevColumn;
RefPtr<nsTreeColumn> prevColumn;
aColumn->GetPrevious(getter_AddRefs(prevColumn));
while (prevColumn && IsColumnHidden(prevColumn)) {
nsCOMPtr<nsITreeColumn> tempColumn;
prevColumn->GetPrevious(getter_AddRefs(tempColumn));
prevColumn.swap(tempColumn);
prevColumn = prevColumn->GetPrevious();
}
return prevColumn.forget();

11
accessible/base/nsCoreUtils.h
View File

@ -17,6 +17,7 @@
#include "nsTArray.h"
class nsRange;
class nsTreeColumn;
class nsIBoxObject;
class nsIFrame;
class nsIDocShell;
@ -51,7 +52,7 @@ public:
* nsITreeBoxObject for available values
*/
static void DispatchClickEvent(nsITreeBoxObject *aTreeBoxObj,
int32_t aRowIndex, nsITreeColumn *aColumn,
int32_t aRowIndex, nsTreeColumn *aColumn,
const nsAString& aPseudoElt = EmptyString());
/**
@ -249,7 +250,7 @@ public:
/**
* Return first sensible column for the given tree box object.
*/
static already_AddRefed<nsITreeColumn>
static already_AddRefed<nsTreeColumn>
GetFirstSensibleColumn(nsITreeBoxObject *aTree);
/**
@ -260,19 +261,19 @@ public:
/**
* Return sensible column at the given index for the given tree box object.
*/
static already_AddRefed<nsITreeColumn>
static already_AddRefed<nsTreeColumn>
GetSensibleColumnAt(nsITreeBoxObject *aTree, uint32_t aIndex);
/**
* Return next sensible column for the given column.
*/
static already_AddRefed<nsITreeColumn>
static already_AddRefed<nsTreeColumn>
GetNextSensibleColumn(nsITreeColumn *aColumn);
/**
* Return previous sensible column for the given column.
*/
static already_AddRefed<nsITreeColumn>
static already_AddRefed<nsTreeColumn>
GetPreviousSensibleColumn(nsITreeColumn *aColumn);
/**

2
accessible/windows/msaa/XULTreeGridAccessibleWrap.h
View File

@ -52,7 +52,7 @@ public:
XULTreeGridRowAccessible* aRowAcc,
nsITreeBoxObject* aTree,
nsITreeView* aTreeView,
int32_t aRow, nsITreeColumn* aColumn) :
int32_t aRow, nsTreeColumn* aColumn) :
XULTreeGridCellAccessible(aContent, aDoc, aRowAcc, aTree, aTreeView, aRow,
aColumn), ia2AccessibleTableCell(this) {}

6
accessible/xul/XULTreeAccessible.cpp
View File

@ -194,7 +194,7 @@ XULTreeAccessible::ChildAtPoint(int32_t aX, int32_t aY,
int32_t clientY = presContext->DevPixelsToIntCSSPixels(aY) - rootRect.Y();
int32_t row = -1;
nsCOMPtr<nsITreeColumn> column;
RefPtr<nsTreeColumn> column;
nsAutoString childEltUnused;
mTree->GetCellAt(clientX, clientY, &row, getter_AddRefs(column),
childEltUnused);
@ -724,7 +724,7 @@ XULTreeItemAccessibleBase::BoundsInCSSPixels() const
return nsIntRect();
}
nsCOMPtr<nsITreeColumn> column = nsCoreUtils::GetFirstSensibleColumn(mTree);
RefPtr<nsTreeColumn> column = nsCoreUtils::GetFirstSensibleColumn(mTree);
int32_t x = 0, y = 0, width = 0, height = 0;
nsresult rv = mTree->GetCoordsForCellItem(mRow, column, EmptyString(),
@ -1039,7 +1039,7 @@ XULTreeItemAccessibleBase::IsExpandable() const
}
void
XULTreeItemAccessibleBase::GetCellName(nsITreeColumn* aColumn, nsAString& aName) const
XULTreeItemAccessibleBase::GetCellName(nsTreeColumn* aColumn, nsAString& aName) const
{
mTreeView->GetCellText(mRow, aColumn, aName);

8
accessible/xul/XULTreeAccessible.h
View File

@ -11,7 +11,7 @@
#include "XULListboxAccessible.h"
class nsTreeBodyFrame;
class nsITreeColumn;
class nsTreeColumn;
namespace mozilla {
namespace a11y {
@ -177,7 +177,7 @@ public:
* Return cell accessible for the given column. If XUL tree accessible is not
* accessible table then return null.
*/
virtual XULTreeGridCellAccessible* GetCellAccessible(nsITreeColumn* aColumn) const
virtual XULTreeGridCellAccessible* GetCellAccessible(nsTreeColumn* aColumn) const
{ return nullptr; }
/**
@ -206,7 +206,7 @@ protected:
/**
* Return name for cell at the given column.
*/
void GetCellName(nsITreeColumn* aColumn, nsAString& aName) const;
void GetCellName(nsTreeColumn* aColumn, nsAString& aName) const;
nsCOMPtr<nsITreeBoxObject> mTree;
nsITreeView* mTreeView;
@ -244,7 +244,7 @@ protected:
virtual ~XULTreeItemAccessible();
// XULTreeItemAccessible
nsCOMPtr<nsITreeColumn> mColumn;
RefPtr<nsTreeColumn> mColumn;
nsString mCachedName;
};

16
accessible/xul/XULTreeGridAccessible.cpp
View File

@ -126,7 +126,7 @@ XULTreeGridAccessible::CellAt(uint32_t aRowIndex, uint32_t aColumnIndex)
if (!row)
return nullptr;
nsCOMPtr<nsITreeColumn> column =
RefPtr<nsTreeColumn> column =
nsCoreUtils::GetSensibleColumnAt(mTree, aColumnIndex);
if (!column)
return nullptr;
@ -298,7 +298,7 @@ XULTreeGridRowAccessible::Name(nsString& aName) const
aName.Truncate();
// XXX: the row name sholdn't be a concatenation of cell names (bug 664384).
nsCOMPtr<nsITreeColumn> column = nsCoreUtils::GetFirstSensibleColumn(mTree);
RefPtr<nsTreeColumn> column = nsCoreUtils::GetFirstSensibleColumn(mTree);
while (column) {
if (!aName.IsEmpty())
aName.Append(' ');
@ -333,7 +333,7 @@ XULTreeGridRowAccessible::ChildAtPoint(int32_t aX, int32_t aY,
int32_t clientY = presContext->DevPixelsToIntCSSPixels(aY) - rootRect.Y();
int32_t row = -1;
nsCOMPtr<nsITreeColumn> column;
RefPtr<nsTreeColumn> column;
nsAutoString childEltUnused;
mTree->GetCellAt(clientX, clientY, &row, getter_AddRefs(column),
childEltUnused);
@ -351,7 +351,7 @@ XULTreeGridRowAccessible::GetChildAt(uint32_t aIndex) const
if (IsDefunct())
return nullptr;
nsCOMPtr<nsITreeColumn> column =
RefPtr<nsTreeColumn> column =
nsCoreUtils::GetSensibleColumnAt(mTree, aIndex);
if (!column)
return nullptr;
@ -369,7 +369,7 @@ XULTreeGridRowAccessible::ChildCount() const
// XULTreeGridRowAccessible: XULTreeItemAccessibleBase implementation
XULTreeGridCellAccessible*
XULTreeGridRowAccessible::GetCellAccessible(nsITreeColumn* aColumn) const
XULTreeGridRowAccessible::GetCellAccessible(nsTreeColumn* aColumn) const
{
MOZ_ASSERT(aColumn, "No tree column!");
@ -420,7 +420,7 @@ XULTreeGridCellAccessible::
XULTreeGridCellAccessible(nsIContent* aContent, DocAccessible* aDoc,
XULTreeGridRowAccessible* aRowAcc,
nsITreeBoxObject* aTree, nsITreeView* aTreeView,
int32_t aRow, nsITreeColumn* aColumn) :
int32_t aRow, nsTreeColumn* aColumn) :
LeafAccessible(aContent, aDoc), mTree(aTree),
mTreeView(aTreeView), mRow(aRow), mColumn(aColumn)
{
@ -616,7 +616,7 @@ uint32_t
XULTreeGridCellAccessible::ColIdx() const
{
uint32_t colIdx = 0;
nsCOMPtr<nsITreeColumn> column = mColumn;
RefPtr<nsTreeColumn> column = mColumn;
while ((column = nsCoreUtils::GetPreviousSensibleColumn(column)))
colIdx++;
@ -782,7 +782,7 @@ XULTreeGridCellAccessible::GetSiblingAtOffset(int32_t aOffset,
if (aError)
*aError = NS_OK; // fail peacefully
nsCOMPtr<nsITreeColumn> columnAtOffset(mColumn), column;
RefPtr<nsTreeColumn> columnAtOffset(mColumn), column;
if (aOffset < 0) {
for (int32_t index = aOffset; index < 0 && columnAtOffset; index++) {
column = nsCoreUtils::GetPreviousSensibleColumn(columnAtOffset);

6
accessible/xul/XULTreeGridAccessible.h
View File

@ -90,7 +90,7 @@ public:
virtual uint32_t ChildCount() const override;
// XULTreeItemAccessibleBase
XULTreeGridCellAccessible* GetCellAccessible(nsITreeColumn* aColumn)
XULTreeGridCellAccessible* GetCellAccessible(nsTreeColumn* aColumn)
const final;
virtual void RowInvalidated(int32_t aStartColIdx, int32_t aEndColIdx) override;
@ -116,7 +116,7 @@ public:
XULTreeGridCellAccessible(nsIContent* aContent, DocAccessible* aDoc,
XULTreeGridRowAccessible* aRowAcc,
nsITreeBoxObject* aTree, nsITreeView* aTreeView,
int32_t aRow, nsITreeColumn* aColumn);
int32_t aRow, nsTreeColumn* aColumn);
// nsISupports
NS_DECL_ISUPPORTS_INHERITED
@ -179,7 +179,7 @@ protected:
nsITreeView* mTreeView;
int32_t mRow;
nsCOMPtr<nsITreeColumn> mColumn;
RefPtr<nsTreeColumn> mColumn;
nsString mCachedTextEquiv;
};

6
layout/xul/nsXULTooltipListener.cpp
View File

@ -351,7 +351,7 @@ nsXULTooltipListener::CheckTreeBodyMove(MouseEvent* aMouseEvent)
int32_t y = aMouseEvent->ScreenY(CallerType::System);
int32_t row;
nsCOMPtr<nsITreeColumn> col;
RefPtr<nsTreeColumn> col;
nsAutoString obj;
// subtract off the documentElement's boxObject
@ -456,7 +456,7 @@ nsXULTooltipListener::ShowTooltip()
#ifdef DEBUG_crap
static void
GetTreeCellCoords(nsITreeBoxObject* aTreeBox, nsIContent* aSourceNode,
int32_t aRow, nsITreeColumn* aCol, int32_t* aX, int32_t* aY)
int32_t aRow, nsTreeColumn* aCol, int32_t* aX, int32_t* aY)
{
int32_t junk;
aTreeBox->GetCoordsForCellItem(aRow, aCol, EmptyCString(), aX, aY, &junk, &junk);
@ -472,7 +472,7 @@ GetTreeCellCoords(nsITreeBoxObject* aTreeBox, nsIContent* aSourceNode,
static void
SetTitletipLabel(nsITreeBoxObject* aTreeBox, Element* aTooltip,
int32_t aRow, nsITreeColumn* aCol)
int32_t aRow, nsTreeColumn* aCol)
{
nsCOMPtr<nsITreeView> view;
aTreeBox->GetView(getter_AddRefs(view));

4
layout/xul/nsXULTooltipListener.h
View File

@ -18,7 +18,7 @@
#include "mozilla/Attributes.h"
class nsIContent;
class nsITreeColumn;
class nsTreeColumn;
namespace mozilla {
namespace dom {
@ -99,7 +99,7 @@ protected:
bool mIsSourceTree;
bool mNeedTitletip;
int32_t mLastTreeRow;
nsCOMPtr<nsITreeColumn> mLastTreeCol;
RefPtr<nsTreeColumn> mLastTreeCol;
#endif
};

33
layout/xul/tree/TreeBoxObject.cpp
View File

@ -353,7 +353,7 @@ TreeBoxObject::EnsureRowIsVisible(int32_t aRow)
}
NS_IMETHODIMP
TreeBoxObject::EnsureCellIsVisible(int32_t aRow, nsITreeColumn* aCol)
TreeBoxObject::EnsureCellIsVisible(int32_t aRow, nsTreeColumn* aCol)
{
nsTreeBodyFrame* body = GetTreeBodyFrame();
if (body)
@ -389,7 +389,7 @@ TreeBoxObject::ScrollByPages(int32_t aNumPages)
}
NS_IMETHODIMP
TreeBoxObject::ScrollToCell(int32_t aRow, nsITreeColumn* aCol)
TreeBoxObject::ScrollToCell(int32_t aRow, nsTreeColumn* aCol)
{
nsTreeBodyFrame* body = GetTreeBodyFrame();
if (body)
@ -398,7 +398,7 @@ TreeBoxObject::ScrollToCell(int32_t aRow, nsITreeColumn* aCol)
}
NS_IMETHODIMP
TreeBoxObject::ScrollToColumn(nsITreeColumn* aCol)
TreeBoxObject::ScrollToColumn(nsTreeColumn* aCol)
{
nsTreeBodyFrame* body = GetTreeBodyFrame();
if (body)
@ -424,7 +424,7 @@ NS_IMETHODIMP TreeBoxObject::Invalidate()
}
NS_IMETHODIMP
TreeBoxObject::InvalidateColumn(nsITreeColumn* aCol)
TreeBoxObject::InvalidateColumn(nsTreeColumn* aCol)
{
nsTreeBodyFrame* body = GetTreeBodyFrame();
if (body)
@ -442,7 +442,7 @@ TreeBoxObject::InvalidateRow(int32_t aIndex)
}
NS_IMETHODIMP
TreeBoxObject::InvalidateCell(int32_t aRow, nsITreeColumn* aCol)
TreeBoxObject::InvalidateCell(int32_t aRow, nsTreeColumn* aCol)
{
nsTreeBodyFrame* body = GetTreeBodyFrame();
if (body)
@ -460,7 +460,7 @@ TreeBoxObject::InvalidateRange(int32_t aStart, int32_t aEnd)
}
NS_IMETHODIMP
TreeBoxObject::InvalidateColumnRange(int32_t aStart, int32_t aEnd, nsITreeColumn* aCol)
TreeBoxObject::InvalidateColumnRange(int32_t aStart, int32_t aEnd, nsTreeColumn* aCol)
{
nsTreeBodyFrame* body = GetTreeBodyFrame();
if (body)
@ -488,7 +488,7 @@ TreeBoxObject::GetRowAt(int32_t x, int32_t y)
NS_IMETHODIMP
TreeBoxObject::GetCellAt(int32_t aX, int32_t aY, int32_t *aRow,
nsITreeColumn** aCol, nsAString& aChildElt)
nsTreeColumn** aCol, nsAString& aChildElt)
{
*aRow = 0;
*aCol = nullptr;
@ -505,9 +505,8 @@ TreeBoxObject::GetCellAt(int32_t aX, int32_t aY, int32_t *aRow,
void
TreeBoxObject::GetCellAt(int32_t x, int32_t y, TreeCellInfo& aRetVal, ErrorResult& aRv)
{
nsCOMPtr<nsITreeColumn> col;
GetCellAt(x, y, &aRetVal.mRow, getter_AddRefs(col), aRetVal.mChildElt);
aRetVal.mCol = col.forget().downcast<nsTreeColumn>();
GetCellAt(x, y, &aRetVal.mRow, getter_AddRefs(aRetVal.mCol),
aRetVal.mChildElt);
}
void
@ -519,9 +518,9 @@ TreeBoxObject::GetCellAt(JSContext* cx,
ErrorResult& aRv)
{
int32_t row;
nsITreeColumn* col;
RefPtr<nsTreeColumn> col;
nsAutoString childElt;
GetCellAt(x, y, &row, &col, childElt);
GetCellAt(x, y, &row, getter_AddRefs(col), childElt);
JS::Rooted<JS::Value> v(cx);
@ -543,7 +542,7 @@ TreeBoxObject::GetCellAt(JSContext* cx,
}
NS_IMETHODIMP
TreeBoxObject::GetCoordsForCellItem(int32_t aRow, nsITreeColumn* aCol, const nsAString& aElement,
TreeBoxObject::GetCoordsForCellItem(int32_t aRow, nsTreeColumn* aCol, const nsAString& aElement,
int32_t *aX, int32_t *aY, int32_t *aWidth, int32_t *aHeight)
{
*aX = *aY = *aWidth = *aHeight = 0;
@ -599,7 +598,7 @@ TreeBoxObject::GetCoordsForCellItem(JSContext* cx,
}
NS_IMETHODIMP
TreeBoxObject::IsCellCropped(int32_t aRow, nsITreeColumn* aCol, bool *aIsCropped)
TreeBoxObject::IsCellCropped(int32_t aRow, nsTreeColumn* aCol, bool *aIsCropped)
{
*aIsCropped = false;
nsTreeBodyFrame* body = GetTreeBodyFrame();
@ -609,7 +608,7 @@ TreeBoxObject::IsCellCropped(int32_t aRow, nsITreeColumn* aCol, bool *aIsCropped
}
bool
TreeBoxObject::IsCellCropped(int32_t row, nsITreeColumn* col, ErrorResult& aRv)
TreeBoxObject::IsCellCropped(int32_t row, nsTreeColumn* col, ErrorResult& aRv)
{
bool ret;
aRv = IsCellCropped(row, col, &ret);
@ -653,7 +652,7 @@ TreeBoxObject::ClearStyleAndImageCaches()
}
NS_IMETHODIMP
TreeBoxObject::RemoveImageCacheEntry(int32_t aRowIndex, nsITreeColumn* aCol)
TreeBoxObject::RemoveImageCacheEntry(int32_t aRowIndex, nsTreeColumn* aCol)
{
NS_ENSURE_ARG(aCol);
NS_ENSURE_TRUE(aRowIndex >= 0, NS_ERROR_INVALID_ARG);
@ -665,7 +664,7 @@ TreeBoxObject::RemoveImageCacheEntry(int32_t aRowIndex, nsITreeColumn* aCol)
}
void
TreeBoxObject::RemoveImageCacheEntry(int32_t row, nsITreeColumn& col, ErrorResult& aRv)
TreeBoxObject::RemoveImageCacheEntry(int32_t row, nsTreeColumn& col, ErrorResult& aRv)
{
aRv = RemoveImageCacheEntry(row, &col);
}

16
layout/xul/tree/TreeBoxObject.h
View File

@ -76,9 +76,9 @@ public:
const nsAString& element,
ErrorResult& aRv);
bool IsCellCropped(int32_t row, nsITreeColumn* col, ErrorResult& aRv);
bool IsCellCropped(int32_t row, nsTreeColumn* col, ErrorResult& aRv);
void RemoveImageCacheEntry(int32_t row, nsITreeColumn& col, ErrorResult& aRv);
void RemoveImageCacheEntry(int32_t row, nsTreeColumn& col, ErrorResult& aRv);
// Deprecated APIs from old IDL
void GetCellAt(JSContext* cx,
@ -105,18 +105,18 @@ public:
// void ClearStyleAndImageCaches();
// void SetFocused(bool arg);
// void EnsureRowIsVisible(int32_t index);
// void EnsureCellIsVisible(int32_t row, nsITreeColumn* col);
// void EnsureCellIsVisible(int32_t row, nsTreeColumn* col);
// void ScrollToRow(int32_t index);
// void ScrollByLines(int32_t numLines);
// void ScrollByPages(int32_t numPages);
// void ScrollToCell(int32_t row, nsITreeColumn* col);
// void ScrollToColumn(nsITreeColumn* col);
// void ScrollToCell(int32_t row, nsTreeColumn* col);
// void ScrollToColumn(nsTreeColumn* col);
// void ScrollToHorizontalPosition(int32_t horizontalPosition);
// void InvalidateColumn(nsITreeColumn* col);
// void InvalidateColumn(nsTreeColumn* col);
// void InvalidateRow(int32_t index);
// void InvalidateCell(int32_t row, nsITreeColumn* col);
// void InvalidateCell(int32_t row, nsTreeColumn* col);
// void InvalidateRange(int32_t startIndex, int32_t endIndex);
// void InvalidateColumnRange(int32_t startIndex, int32_t endIndex, nsITreeColumn* col);
// void InvalidateColumnRange(int32_t startIndex, int32_t endIndex, nsTreeColumn* col);
// void RowCountChanged(int32_t index, int32_t count);
protected:

22
layout/xul/tree/nsITreeBoxObject.idl
View File

@ -7,10 +7,10 @@
interface nsITreeView;
interface nsITreeSelection;
interface nsITreeColumn;
interface nsIScriptableRegion;
webidl Element;
webidl TreeColumn;
webidl TreeColumns;
/**
@ -84,7 +84,7 @@ interface nsITreeBoxObject : nsISupports
/**
* Ensures that a given cell in the tree is visible.
*/
void ensureCellIsVisible(in long row, in nsITreeColumn col);
void ensureCellIsVisible(in long row, in TreeColumn col);
/**
* Scrolls such that the row at index is at the top of the visible view.
@ -110,13 +110,13 @@ interface nsITreeBoxObject : nsISupports
* Scrolls such that a given cell is visible (if possible)
* at the top left corner of the visible view.
*/
void scrollToCell(in long row, in nsITreeColumn col);
void scrollToCell(in long row, in TreeColumn col);
/**
* Scrolls horizontally so that the specified column is
* at the left of the view (if possible).
*/
void scrollToColumn(in nsITreeColumn col);
void scrollToColumn(in TreeColumn col);
/**
* Scroll to a specific horizontal pixel position.
@ -127,12 +127,12 @@ interface nsITreeBoxObject : nsISupports
* Invalidation methods for fine-grained painting control.
*/
void invalidate();
void invalidateColumn(in nsITreeColumn col);
void invalidateColumn(in TreeColumn col);
void invalidateRow(in long index);
void invalidateCell(in long row, in nsITreeColumn col);
void invalidateCell(in long row, in TreeColumn col);
void invalidateRange(in long startIndex, in long endIndex);
void invalidateColumnRange(in long startIndex, in long endIndex,
in nsITreeColumn col);
in TreeColumn col);
/**
* A hit test that can tell you what row the mouse is over.
@ -152,18 +152,18 @@ interface nsITreeBoxObject : nsISupports
* The coordinate system is the client coordinate system for the
* document this boxObject lives in, and the units are CSS pixels.
*/
void getCellAt(in long x, in long y, out long row, out nsITreeColumn col, out AString childElt);
void getCellAt(in long x, in long y, out long row, out TreeColumn col, out AString childElt);
/**
* Find the coordinates of an element within a specific cell.
*/
void getCoordsForCellItem(in long row, in nsITreeColumn col, in AString element,
void getCoordsForCellItem(in long row, in TreeColumn col, in AString element,
out long x, out long y, out long width, out long height);
/**
* Determine if the text of a cell is being cropped or not.
*/
boolean isCellCropped(in long row, in nsITreeColumn col);
boolean isCellCropped(in long row, in TreeColumn col);
/**
* The view is responsible for calling these notification methods when
@ -197,5 +197,5 @@ interface nsITreeBoxObject : nsISupports
* @note This only affects images supplied by the view, not the ones supplied
* through the styling context, like twisties or checkboxes.
*/
void removeImageCacheEntry(in long row, in nsITreeColumn col);
void removeImageCacheEntry(in long row, in TreeColumn col);
};

5
layout/xul/tree/nsITreeColumns.idl
View File

@ -5,6 +5,7 @@
#include "nsISupports.idl"
webidl Element;
webidl TreeColumn;
webidl TreeColumns;
[scriptable, builtinclass, uuid(ae835ecf-6b32-4660-9b43-8a270df56e02)]
@ -32,8 +33,8 @@ interface nsITreeColumn : nsISupports
const short TYPE_PASSWORD = 3;
readonly attribute short type;
nsITreeColumn getNext();
nsITreeColumn getPrevious();
TreeColumn getNext();
TreeColumn getPrevious();
void invalidate();
};

5
layout/xul/tree/nsITreeSelection.idl
View File

@ -4,7 +4,8 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
interface nsITreeBoxObject;
interface nsITreeColumn;
webidl TreeColumn;
#include "nsISupports.idl"
@ -109,7 +110,7 @@ interface nsITreeSelection : nsISupports
/**
* The current column.
*/
attribute nsITreeColumn currentColumn;
attribute TreeColumn currentColumn;
/**
* The selection "pivot". This is the first item the user selected as

26
layout/xul/tree/nsITreeView.idl
View File

@ -7,9 +7,9 @@
interface nsITreeBoxObject;
interface nsITreeSelection;
interface nsITreeColumn;
webidl DataTransfer;
webidl TreeColumn;
[scriptable, uuid(091116f0-0bdc-4b32-b9c8-c8d5a37cb088)]
interface nsITreeView : nsISupports
@ -40,13 +40,13 @@ interface nsITreeView : nsISupports
* ::-moz-tree-image(x), ::-moz-tree-cell-text(x). to be matched on the
* cell.
*/
AString getCellProperties(in long row, in nsITreeColumn col);
AString getCellProperties(in long row, in TreeColumn col);
/**
* Called to get properties to paint a column background. For shading the sort
* column, etc.
*/
AString getColumnProperties(in nsITreeColumn col);
AString getColumnProperties(in TreeColumn col);
/**
* Methods that can be used to test whether or not a twisty should be drawn,
@ -113,19 +113,19 @@ interface nsITreeView : nsISupports
* If the empty string is returned, the :moz-tree-image pseudoelement
* will be used.
*/
AString getImageSrc(in long row, in nsITreeColumn col);
AString getImageSrc(in long row, in TreeColumn col);
/**
* The value for a given cell. This method is only called for columns
* of type other than |text|.
*/
AString getCellValue(in long row, in nsITreeColumn col);
AString getCellValue(in long row, in TreeColumn col);
/**
* The text for a given cell. If a column consists only of an image, then
* the empty string is returned.
*/
AString getCellText(in long row, in nsITreeColumn col);
AString getCellText(in long row, in TreeColumn col);
/**
* Called during initialization to link the view to the front end box object.
@ -140,7 +140,7 @@ interface nsITreeView : nsISupports
/**
* Called on the view when a header is clicked.
*/
void cycleHeader(in nsITreeColumn col);
void cycleHeader(in TreeColumn col);
/**
* Should be called from a XUL onselect handler whenever the selection changes.
@ -150,32 +150,32 @@ interface nsITreeView : nsISupports
/**
* Called on the view when a cell in a non-selectable cycling column (e.g., unread/flag/etc.) is clicked.
*/
void cycleCell(in long row, in nsITreeColumn col);
void cycleCell(in long row, in TreeColumn col);
/**
* isEditable is called to ask the view if the cell contents are editable.
* A value of true will result in the tree popping up a text field when
* the user tries to inline edit the cell.
*/
boolean isEditable(in long row, in nsITreeColumn col);
boolean isEditable(in long row, in TreeColumn col);
/**
* isSelectable is called to ask the view if the cell is selectable.
* This method is only called if the selection style is |cell| or |text|.
* XXXvarga shouldn't this be called isCellSelectable?
*/
boolean isSelectable(in long row, in nsITreeColumn col);
boolean isSelectable(in long row, in TreeColumn col);
/**
* setCellValue is called when the value of the cell has been set by the user.
* This method is only called for columns of type other than |text|.
*/
void setCellValue(in long row, in nsITreeColumn col, in AString value);
void setCellValue(in long row, in TreeColumn col, in AString value);
/**
* setCellText is called when the contents of the cell have been edited by the user.
*/
void setCellText(in long row, in nsITreeColumn col, in AString value);
void setCellText(in long row, in TreeColumn col, in AString value);
/**
* A command API that can be used to invoke commands on the selection. The tree
@ -192,5 +192,5 @@ interface nsITreeView : nsISupports
/**
* A command API that can be used to invoke commands on a specific cell.
*/
void performActionOnCell(in wstring action, in long row, in nsITreeColumn col);
void performActionOnCell(in wstring action, in long row, in TreeColumn col);
};

8
layout/xul/tree/nsTreeBodyFrame.cpp
View File

@ -1041,8 +1041,8 @@ nsTreeBodyFrame::GetRowAt(int32_t aX, int32_t aY, int32_t* _retval)
}
nsresult
nsTreeBodyFrame::GetCellAt(int32_t aX, int32_t aY, int32_t* aRow, nsITreeColumn** aCol,
nsACString& aChildElt)
nsTreeBodyFrame::GetCellAt(int32_t aX, int32_t aY, int32_t* aRow,
nsTreeColumn** aCol, nsACString& aChildElt)
{
if (!mView)
return NS_OK;
@ -1964,7 +1964,7 @@ nsTreeBodyFrame::PrefillPropertyArray(int32_t aRowIndex, nsTreeColumn* aCol)
// active
if (aCol) {
nsCOMPtr<nsITreeColumn> currentColumn;
RefPtr<nsTreeColumn> currentColumn;
selection->GetCurrentColumn(getter_AddRefs(currentColumn));
if (aCol == currentColumn)
mScratchArray.AppendElement(nsGkAtoms::active);
@ -4373,7 +4373,7 @@ nsTreeBodyFrame::ClearStyleAndImageCaches()
}
nsresult
nsTreeBodyFrame::RemoveImageCacheEntry(int32_t aRowIndex, nsITreeColumn* aCol)
nsTreeBodyFrame::RemoveImageCacheEntry(int32_t aRowIndex, nsTreeColumn* aCol)
{
nsAutoString imageSrc;
if (NS_SUCCEEDED(mView->GetImageSrc(aRowIndex, aCol, imageSrc))) {

4
layout/xul/tree/nsTreeBodyFrame.h
View File

@ -107,7 +107,7 @@ public:
nsITreeColumn *aCol);
nsresult GetRowAt(int32_t aX, int32_t aY, int32_t *aValue);
nsresult GetCellAt(int32_t aX, int32_t aY, int32_t *aRow,
nsITreeColumn **aCol, nsACString &aChildElt);
nsTreeColumn **aCol, nsACString &aChildElt);
nsresult GetCoordsForCellItem(int32_t aRow, nsITreeColumn *aCol,
const nsACString &aElt,
int32_t *aX, int32_t *aY,
@ -117,7 +117,7 @@ public:
nsresult BeginUpdateBatch();
nsresult EndUpdateBatch();
nsresult ClearStyleAndImageCaches();
nsresult RemoveImageCacheEntry(int32_t aRowIndex, nsITreeColumn* aCol);
nsresult RemoveImageCacheEntry(int32_t aRowIndex, nsTreeColumn* aCol);
void CancelImageRequests();

4
layout/xul/tree/nsTreeColumns.cpp
View File

@ -240,14 +240,14 @@ nsTreeColumn::GetType(int16_t* aType)
}
NS_IMETHODIMP
nsTreeColumn::GetNext(nsITreeColumn** _retval)
nsTreeColumn::GetNext(nsTreeColumn** _retval)
{
NS_IF_ADDREF(*_retval = GetNext());
return NS_OK;
}
NS_IMETHODIMP
nsTreeColumn::GetPrevious(nsITreeColumn** _retval)
nsTreeColumn::GetPrevious(nsTreeColumn** _retval)
{
NS_IF_ADDREF(*_retval = GetPrevious());
return NS_OK;

3
layout/xul/tree/nsTreeColumns.h
View File

@ -107,9 +107,8 @@ protected:
void SetColumns(nsTreeColumns* aColumns) { mColumns = aColumns; }
const nsAString& GetId() { return mId; }
public:
const nsAString& GetId() { return mId; }
nsAtom* GetAtom() { return mAtom; }
int32_t GetIndex() { return mIndex; }

74
layout/xul/tree/nsTreeContentView.cpp
View File

@ -233,14 +233,13 @@ nsTreeContentView::GetCellProperties(int32_t aRow, nsTreeColumn& aColumn,
}
NS_IMETHODIMP
nsTreeContentView::GetCellProperties(int32_t aRow, nsITreeColumn* aCol,
nsTreeContentView::GetCellProperties(int32_t aRow, nsTreeColumn* aCol,
nsAString& aProps)
{
RefPtr<nsTreeColumn> col = nsTreeColumn::From(aCol);
NS_ENSURE_ARG(col);
NS_ENSURE_ARG(aCol);
ErrorResult rv;
GetCellProperties(aRow, *col, aProps, rv);
GetCellProperties(aRow, *aCol, aProps, rv);
return rv.StealNSResult();
}
@ -256,12 +255,11 @@ nsTreeContentView::GetColumnProperties(nsTreeColumn& aColumn,
}
NS_IMETHODIMP
nsTreeContentView::GetColumnProperties(nsITreeColumn* aCol, nsAString& aProps)
nsTreeContentView::GetColumnProperties(nsTreeColumn* aCol, nsAString& aProps)
{
RefPtr<nsTreeColumn> col = nsTreeColumn::From(aCol);
NS_ENSURE_ARG(col);
NS_ENSURE_ARG(aCol);
GetColumnProperties(*col, aProps);
GetColumnProperties(*aCol, aProps);
return NS_OK;
}
@ -498,13 +496,12 @@ nsTreeContentView::GetImageSrc(int32_t aRow, nsTreeColumn& aColumn,
}
NS_IMETHODIMP
nsTreeContentView::GetImageSrc(int32_t aRow, nsITreeColumn* aCol, nsAString& _retval)
nsTreeContentView::GetImageSrc(int32_t aRow, nsTreeColumn* aCol, nsAString& _retval)
{
RefPtr<nsTreeColumn> col = nsTreeColumn::From(aCol);
NS_ENSURE_ARG(col);
NS_ENSURE_ARG(aCol);
ErrorResult rv;
GetImageSrc(aRow, *col, _retval, rv);
GetImageSrc(aRow, *aCol, _retval, rv);
return rv.StealNSResult();
}
@ -529,13 +526,12 @@ nsTreeContentView::GetCellValue(int32_t aRow, nsTreeColumn& aColumn,
}
NS_IMETHODIMP
nsTreeContentView::GetCellValue(int32_t aRow, nsITreeColumn* aCol, nsAString& _retval)
nsTreeContentView::GetCellValue(int32_t aRow, nsTreeColumn* aCol, nsAString& _retval)
{
RefPtr<nsTreeColumn> col = nsTreeColumn::From(aCol);
NS_ENSURE_ARG(col);
NS_ENSURE_ARG(aCol);
ErrorResult rv;
GetCellValue(aRow, *col, _retval, rv);
GetCellValue(aRow, *aCol, _retval, rv);
return rv.StealNSResult();
}
@ -569,13 +565,12 @@ nsTreeContentView::GetCellText(int32_t aRow, nsTreeColumn& aColumn,
}
NS_IMETHODIMP
nsTreeContentView::GetCellText(int32_t aRow, nsITreeColumn* aCol, nsAString& _retval)
nsTreeContentView::GetCellText(int32_t aRow, nsTreeColumn* aCol, nsAString& _retval)
{
RefPtr<nsTreeColumn> col = nsTreeColumn::From(aCol);
NS_ENSURE_ARG(col);
NS_ENSURE_ARG(aCol);
ErrorResult rv;
GetCellText(aRow, *col, _retval, rv);
GetCellText(aRow, *aCol, _retval, rv);
return rv.StealNSResult();
}
@ -692,13 +687,12 @@ nsTreeContentView::CycleHeader(nsTreeColumn& aColumn, ErrorResult& aError)
}
NS_IMETHODIMP
nsTreeContentView::CycleHeader(nsITreeColumn* aCol)
nsTreeContentView::CycleHeader(nsTreeColumn* aCol)
{
RefPtr<nsTreeColumn> col = nsTreeColumn::From(aCol);
NS_ENSURE_ARG(col);
NS_ENSURE_ARG(aCol);
ErrorResult rv;
CycleHeader(*col, rv);
CycleHeader(*aCol, rv);
return rv.StealNSResult();
}
@ -709,7 +703,7 @@ nsTreeContentView::SelectionChanged()
}
NS_IMETHODIMP
nsTreeContentView::CycleCell(int32_t aRow, nsITreeColumn* aCol)
nsTreeContentView::CycleCell(int32_t aRow, nsTreeColumn* aCol)
{
return NS_OK;
}
@ -739,13 +733,12 @@ nsTreeContentView::IsEditable(int32_t aRow, nsTreeColumn& aColumn,
}
NS_IMETHODIMP
nsTreeContentView::IsEditable(int32_t aRow, nsITreeColumn* aCol, bool* _retval)
nsTreeContentView::IsEditable(int32_t aRow, nsTreeColumn* aCol, bool* _retval)
{
RefPtr<nsTreeColumn> col = nsTreeColumn::From(aCol);
NS_ENSURE_ARG(col);
NS_ENSURE_ARG(aCol);
ErrorResult rv;
*_retval = IsEditable(aRow, *col, rv);
*_retval = IsEditable(aRow, *aCol, rv);
return rv.StealNSResult();
}
@ -774,13 +767,12 @@ nsTreeContentView::IsSelectable(int32_t aRow, nsTreeColumn& aColumn,
}
NS_IMETHODIMP
nsTreeContentView::IsSelectable(int32_t aRow, nsITreeColumn* aCol, bool* _retval)
nsTreeContentView::IsSelectable(int32_t aRow, nsTreeColumn* aCol, bool* _retval)
{
RefPtr<nsTreeColumn> col = nsTreeColumn::From(aCol);
NS_ENSURE_ARG(col);
NS_ENSURE_ARG(aCol);
ErrorResult rv;
*_retval = IsSelectable(aRow, *col, rv);
*_retval = IsSelectable(aRow, *aCol, rv);
return rv.StealNSResult();
}
@ -805,13 +797,12 @@ nsTreeContentView::SetCellValue(int32_t aRow, nsTreeColumn& aColumn,
}
NS_IMETHODIMP
nsTreeContentView::SetCellValue(int32_t aRow, nsITreeColumn* aCol, const nsAString& aValue)
nsTreeContentView::SetCellValue(int32_t aRow, nsTreeColumn* aCol, const nsAString& aValue)
{
RefPtr<nsTreeColumn> col = nsTreeColumn::From(aCol);
NS_ENSURE_ARG(col);
NS_ENSURE_ARG(aCol);
ErrorResult rv;
SetCellValue(aRow, *col, aValue, rv);
SetCellValue(aRow, *aCol, aValue, rv);
return rv.StealNSResult();
}
@ -836,13 +827,12 @@ nsTreeContentView::SetCellText(int32_t aRow, nsTreeColumn& aColumn,
}
NS_IMETHODIMP
nsTreeContentView::SetCellText(int32_t aRow, nsITreeColumn* aCol, const nsAString& aValue)
nsTreeContentView::SetCellText(int32_t aRow, nsTreeColumn* aCol, const nsAString& aValue)
{
RefPtr<nsTreeColumn> col = nsTreeColumn::From(aCol);
NS_ENSURE_ARG(col);
NS_ENSURE_ARG(aCol);
ErrorResult rv;
SetCellText(aRow, *col, aValue, rv);
SetCellText(aRow, *aCol, aValue, rv);
return rv.StealNSResult();
}
@ -859,7 +849,7 @@ nsTreeContentView::PerformActionOnRow(const char16_t* aAction, int32_t aRow)
}
NS_IMETHODIMP
nsTreeContentView::PerformActionOnCell(const char16_t* aAction, int32_t aRow, nsITreeColumn* aCol)
nsTreeContentView::PerformActionOnCell(const char16_t* aAction, int32_t aRow, nsTreeColumn* aCol)
{
return NS_OK;
}

4
layout/xul/tree/nsTreeImageListener.cpp
View File

@ -47,7 +47,7 @@ nsTreeImageListener::Notify(imgIRequest *aRequest, int32_t aType, const nsIntRec
}
void
nsTreeImageListener::AddCell(int32_t aIndex, nsITreeColumn* aCol)
nsTreeImageListener::AddCell(int32_t aIndex, nsTreeColumn* aCol)
{
if (!mInvalidationArea) {
mInvalidationArea = new InvalidationArea(aCol);
@ -90,7 +90,7 @@ nsTreeImageListener::Invalidate()
}
}
nsTreeImageListener::InvalidationArea::InvalidationArea(nsITreeColumn* aCol)
nsTreeImageListener::InvalidationArea::InvalidationArea(nsTreeColumn* aCol)
: mCol(aCol),
mMin(-1), // min should start out "undefined"
mMax(0),

10
layout/xul/tree/nsTreeImageListener.h
View File

@ -12,7 +12,7 @@
#include "nsTreeBodyFrame.h"
#include "mozilla/Attributes.h"
class nsITreeColumn;
class nsTreeColumn;
// This class handles image load observation.
class nsTreeImageListener final : public imgINotificationObserver
@ -32,7 +32,7 @@ protected:
void UnsuppressInvalidation() { mInvalidationSuppressed = false; }
void Invalidate();
void AddCell(int32_t aIndex, nsITreeColumn* aCol);
void AddCell(int32_t aIndex, nsTreeColumn* aCol);
private:
nsTreeBodyFrame* mTreeFrame;
@ -42,21 +42,21 @@ private:
class InvalidationArea {
public:
explicit InvalidationArea(nsITreeColumn* aCol);
explicit InvalidationArea(nsTreeColumn* aCol);
~InvalidationArea() { delete mNext; }
friend class nsTreeImageListener;
protected:
void AddRow(int32_t aIndex);
nsITreeColumn* GetCol() { return mCol.get(); }
nsTreeColumn* GetCol() { return mCol.get(); }
int32_t GetMin() { return mMin; }
int32_t GetMax() { return mMax; }
InvalidationArea* GetNext() { return mNext; }
void SetNext(InvalidationArea* aNext) { mNext = aNext; }
private:
nsCOMPtr<nsITreeColumn> mCol;
RefPtr<nsTreeColumn> mCol;
int32_t mMin;
int32_t mMax;
InvalidationArea* mNext;

4
layout/xul/tree/nsTreeSelection.cpp
View File

@ -656,13 +656,13 @@ NS_IMETHODIMP nsTreeSelection::SetCurrentIndex(int32_t aIndex)
return asyncDispatcher->PostDOMEvent();
}
NS_IMETHODIMP nsTreeSelection::GetCurrentColumn(nsITreeColumn** aCurrentColumn)
NS_IMETHODIMP nsTreeSelection::GetCurrentColumn(nsTreeColumn** aCurrentColumn)
{
NS_IF_ADDREF(*aCurrentColumn = mCurrentColumn);
return NS_OK;
}
NS_IMETHODIMP nsTreeSelection::SetCurrentColumn(nsITreeColumn* aCurrentColumn)
NS_IMETHODIMP nsTreeSelection::SetCurrentColumn(nsTreeColumn* aCurrentColumn)
{
if (!mTree) {
return NS_ERROR_UNEXPECTED;

4
layout/xul/tree/nsTreeSelection.h
View File

@ -13,7 +13,7 @@
#include "mozilla/Attributes.h"
class nsITreeBoxObject;
class nsITreeColumn;
class nsTreeColumn;
struct nsTreeRange;
class nsTreeSelection final : public nsINativeTreeSelection
@ -45,7 +45,7 @@ protected:
bool mSuppressed; // Whether or not we should be firing onselect events.
int32_t mCurrentIndex; // The item to draw the rect around. The last one clicked, etc.
nsCOMPtr<nsITreeColumn> mCurrentColumn;
RefPtr<nsTreeColumn> mCurrentColumn;
int32_t mShiftSelectPivot; // Used when multiple SHIFT+selects are performed to pivot on.
nsTreeRange* mFirstRange; // Our list of ranges.

24
security/manager/pki/nsASN1Tree.cpp
View File

@ -192,13 +192,13 @@ nsNSSASN1Tree::GetRowProperties(int32_t, nsAString&)
}
NS_IMETHODIMP
nsNSSASN1Tree::GetCellProperties(int32_t, nsITreeColumn*, nsAString&)
nsNSSASN1Tree::GetCellProperties(int32_t, nsTreeColumn*, nsAString&)
{
return NS_OK;
}
NS_IMETHODIMP
nsNSSASN1Tree::GetColumnProperties(nsITreeColumn*, nsAString&)
nsNSSASN1Tree::GetColumnProperties(nsTreeColumn*, nsAString&)
{
return NS_OK;
}
@ -262,19 +262,19 @@ nsNSSASN1Tree::GetLevel(int32_t index, int32_t* _retval)
}
NS_IMETHODIMP
nsNSSASN1Tree::GetImageSrc(int32_t, nsITreeColumn*, nsAString&)
nsNSSASN1Tree::GetImageSrc(int32_t, nsTreeColumn*, nsAString&)
{
return NS_OK;
}
NS_IMETHODIMP
nsNSSASN1Tree::GetCellValue(int32_t, nsITreeColumn*, nsAString&)
nsNSSASN1Tree::GetCellValue(int32_t, nsTreeColumn*, nsAString&)
{
return NS_OK;
}
NS_IMETHODIMP
nsNSSASN1Tree::GetCellText(int32_t row, nsITreeColumn*, nsAString& _retval)
nsNSSASN1Tree::GetCellText(int32_t row, nsTreeColumn*, nsAString& _retval)
{
NS_ENSURE_ARG_MIN(row, 0);
@ -334,7 +334,7 @@ nsNSSASN1Tree::ToggleOpenState(int32_t index)
}
NS_IMETHODIMP
nsNSSASN1Tree::CycleHeader(nsITreeColumn*)
nsNSSASN1Tree::CycleHeader(nsTreeColumn*)
{
return NS_OK;
}
@ -346,13 +346,13 @@ nsNSSASN1Tree::SelectionChanged()
}
NS_IMETHODIMP
nsNSSASN1Tree::CycleCell(int32_t, nsITreeColumn*)
nsNSSASN1Tree::CycleCell(int32_t, nsTreeColumn*)
{
return NS_OK;
}
NS_IMETHODIMP
nsNSSASN1Tree::IsEditable(int32_t, nsITreeColumn*, bool* _retval)
nsNSSASN1Tree::IsEditable(int32_t, nsTreeColumn*, bool* _retval)
{
NS_ENSURE_ARG_POINTER(_retval);
*_retval = false;
@ -360,7 +360,7 @@ nsNSSASN1Tree::IsEditable(int32_t, nsITreeColumn*, bool* _retval)
}
NS_IMETHODIMP
nsNSSASN1Tree::IsSelectable(int32_t, nsITreeColumn*, bool* _retval)
nsNSSASN1Tree::IsSelectable(int32_t, nsTreeColumn*, bool* _retval)
{
NS_ENSURE_ARG_POINTER(_retval);
*_retval = false;
@ -368,13 +368,13 @@ nsNSSASN1Tree::IsSelectable(int32_t, nsITreeColumn*, bool* _retval)
}
NS_IMETHODIMP
nsNSSASN1Tree::SetCellValue(int32_t, nsITreeColumn*, const nsAString&)
nsNSSASN1Tree::SetCellValue(int32_t, nsTreeColumn*, const nsAString&)
{
return NS_OK;
}
NS_IMETHODIMP
nsNSSASN1Tree::SetCellText(int32_t, nsITreeColumn*, const nsAString&)
nsNSSASN1Tree::SetCellText(int32_t, nsTreeColumn*, const nsAString&)
{
return NS_OK;
}
@ -392,7 +392,7 @@ nsNSSASN1Tree::PerformActionOnRow(const char16_t*, int32_t)
}
NS_IMETHODIMP
nsNSSASN1Tree::PerformActionOnCell(const char16_t*, int32_t, nsITreeColumn*)
nsNSSASN1Tree::PerformActionOnCell(const char16_t*, int32_t, nsTreeColumn*)
{
return NS_OK;
}

24
security/manager/ssl/nsCertTree.cpp
View File

@ -881,14 +881,14 @@ nsCertTree::GetRowProperties(int32_t index, nsAString& aProps)
}
NS_IMETHODIMP
nsCertTree::GetCellProperties(int32_t row, nsITreeColumn* col,
nsCertTree::GetCellProperties(int32_t row, nsTreeColumn* col,
nsAString& aProps)
{
return NS_OK;
}
NS_IMETHODIMP
nsCertTree::GetColumnProperties(nsITreeColumn* col, nsAString& aProps)
nsCertTree::GetColumnProperties(nsTreeColumn* col, nsAString& aProps)
{
return NS_OK;
}
@ -989,7 +989,7 @@ nsCertTree::GetLevel(int32_t index, int32_t *_retval)
}
NS_IMETHODIMP
nsCertTree::GetImageSrc(int32_t row, nsITreeColumn* col,
nsCertTree::GetImageSrc(int32_t row, nsTreeColumn* col,
nsAString& _retval)
{
_retval.Truncate();
@ -997,7 +997,7 @@ nsCertTree::GetImageSrc(int32_t row, nsITreeColumn* col,
}
NS_IMETHODIMP
nsCertTree::GetCellValue(int32_t row, nsITreeColumn* col,
nsCertTree::GetCellValue(int32_t row, nsTreeColumn* col,
nsAString& _retval)
{
_retval.Truncate();
@ -1005,7 +1005,7 @@ nsCertTree::GetCellValue(int32_t row, nsITreeColumn* col,
}
NS_IMETHODIMP
nsCertTree::GetCellText(int32_t row, nsITreeColumn* col,
nsCertTree::GetCellText(int32_t row, nsTreeColumn* col,
nsAString& _retval)
{
if (!mTreeArray)
@ -1124,7 +1124,7 @@ nsCertTree::ToggleOpenState(int32_t index)
}
NS_IMETHODIMP
nsCertTree::CycleHeader(nsITreeColumn* col)
nsCertTree::CycleHeader(nsTreeColumn* col)
{
return NS_OK;
}
@ -1136,34 +1136,34 @@ nsCertTree::SelectionChanged()
}
NS_IMETHODIMP
nsCertTree::CycleCell(int32_t row, nsITreeColumn* col)
nsCertTree::CycleCell(int32_t row, nsTreeColumn* col)
{
return NS_OK;
}
NS_IMETHODIMP
nsCertTree::IsEditable(int32_t row, nsITreeColumn* col, bool *_retval)
nsCertTree::IsEditable(int32_t row, nsTreeColumn* col, bool *_retval)
{
*_retval = false;
return NS_OK;
}
NS_IMETHODIMP
nsCertTree::IsSelectable(int32_t row, nsITreeColumn* col, bool *_retval)
nsCertTree::IsSelectable(int32_t row, nsTreeColumn* col, bool *_retval)
{
*_retval = false;
return NS_OK;
}
NS_IMETHODIMP
nsCertTree::SetCellValue(int32_t row, nsITreeColumn* col,
nsCertTree::SetCellValue(int32_t row, nsTreeColumn* col,
const nsAString& value)
{
return NS_OK;
}
NS_IMETHODIMP
nsCertTree::SetCellText(int32_t row, nsITreeColumn* col,
nsCertTree::SetCellText(int32_t row, nsTreeColumn* col,
const nsAString& value)
{
return NS_OK;
@ -1183,7 +1183,7 @@ nsCertTree::PerformActionOnRow(const char16_t *action, int32_t row)
NS_IMETHODIMP
nsCertTree::PerformActionOnCell(const char16_t *action, int32_t row,
nsITreeColumn* col)
nsTreeColumn* col)
{
return NS_OK;
}