Commit 84d6543a authored by Arjun's avatar Arjun
Browse files

Bug 740750 - Use nsITreeView* instead of nsCOMPtr<nsITreeView> for XUL tree accessibles, r=surkov

parent b2fd1edc

accessible/src/xul/nsXULTreeAccessible.cpp

+6 −7
Original line number Diff line number Diff line
@@ -71,10 +71,13 @@ nsXULTreeAccessible:: 
  mFlags |= eXULTreeAccessible;



  mTree = nsCoreUtils::GetTreeBoxObject(aContent);

  if (mTree)

    mTree->GetView(getter_AddRefs(mTreeView));

  NS_ASSERTION(mTree, "Can't get mTree!\n");



  NS_ASSERTION(mTree && mTreeView, "Can't get mTree or mTreeView!\n");

  if (mTree) {

    nsCOMPtr<nsITreeView> treeView;

    mTree->GetView(getter_AddRefs(treeView));

    mTreeView = treeView;

  }



  nsIContent* parentContent = mContent->GetParent();

  if (parentContent) {
@@ -95,14 +98,12 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULTreeAccessible) 
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXULTreeAccessible,

                                                  nsAccessible)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTree)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTreeView)

  CycleCollectorTraverseCache(tmp->mAccessibleCache, &cb);

NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END



NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsXULTreeAccessible,

                                                nsAccessible)

  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTree)

  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTreeView)

  ClearCache(tmp->mAccessibleCache);

NS_IMPL_CYCLE_COLLECTION_UNLINK_END
@@ -739,13 +740,11 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULTreeItemAccessibleBase) 
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXULTreeItemAccessibleBase,

                                                  nsAccessible)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTree)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTreeView)

NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END



NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsXULTreeItemAccessibleBase,

                                                nsAccessible)

  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTree)

  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTreeView)

NS_IMPL_CYCLE_COLLECTION_UNLINK_END



NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED(nsXULTreeItemAccessibleBase)

accessible/src/xul/nsXULTreeAccessible.h

+2 −2
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ protected: 
  virtual already_AddRefed<nsAccessible> CreateTreeItemAccessible(PRInt32 aRow);



  nsCOMPtr<nsITreeBoxObject> mTree;

  nsCOMPtr<nsITreeView> mTreeView;

  nsITreeView* mTreeView;

  nsAccessibleHashtable mAccessibleCache;

};
@@ -244,7 +244,7 @@ protected: 
  void GetCellName(nsITreeColumn* aColumn, nsAString& aName);



  nsCOMPtr<nsITreeBoxObject> mTree;

  nsCOMPtr<nsITreeView> mTreeView;

  nsITreeView* mTreeView;

  PRInt32 mRow;

};

accessible/src/xul/nsXULTreeGridAccessible.cpp

+0 −2
Original line number Diff line number Diff line
@@ -818,14 +818,12 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULTreeGridCellAccessible) 
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(nsXULTreeGridCellAccessible,

                                                  nsLeafAccessible)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTree)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mTreeView)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE_NSCOMPTR(mColumn)

NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END



NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsXULTreeGridCellAccessible,

                                                nsLeafAccessible)

  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTree)

  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mTreeView)

  NS_IMPL_CYCLE_COLLECTION_UNLINK_NSCOMPTR(mColumn)

NS_IMPL_CYCLE_COLLECTION_UNLINK_END

accessible/src/xul/nsXULTreeGridAccessible.h

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ protected: 
  enum { eAction_Click = 0 };



  nsCOMPtr<nsITreeBoxObject> mTree;

  nsCOMPtr<nsITreeView> mTreeView;

  nsITreeView* mTreeView;



  PRInt32 mRow;

  nsCOMPtr<nsITreeColumn> mColumn;