Commit e2e52af3 authored by Edgar Chen's avatar Edgar Chen
Browse files

Bug 1737694 - Part 1: Rename nsTreeColumn::mContent to mElement; r=hsivonen 

Differential Revision: https://phabricator.services.mozilla.com/D129448
parent 5538c59e

layout/xul/tree/nsTreeBodyFrame.cpp

+6 −4
Original line number Diff line number Diff line
@@ -1786,14 +1786,16 @@ void nsTreeBodyFrame::PrefillPropertyArray(int32_t aRowIndex, 
    }



    // Read special properties from attributes on the column content node

    if (aCol->mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::insertbefore,

                                    nsGkAtoms::_true, eCaseMatters))

    if (aCol->Element()->AttrValueIs(kNameSpaceID_None, nsGkAtoms::insertbefore,

                                     nsGkAtoms::_true, eCaseMatters)) {

      mScratchArray.AppendElement((nsStaticAtom*)nsGkAtoms::insertbefore);

    if (aCol->mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::insertafter,

                                    nsGkAtoms::_true, eCaseMatters))

    }

    if (aCol->Element()->AttrValueIs(kNameSpaceID_None, nsGkAtoms::insertafter,

                                     nsGkAtoms::_true, eCaseMatters)) {

      mScratchArray.AppendElement((nsStaticAtom*)nsGkAtoms::insertafter);

    }

  }

}



nsITheme* nsTreeBodyFrame::GetTwistyRect(int32_t aRowIndex,

                                         nsTreeColumn* aColumn,

layout/xul/tree/nsTreeColumns.cpp

+18 −18
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ using namespace mozilla::dom; 


// Column class that caches all the info about our column.

nsTreeColumn::nsTreeColumn(nsTreeColumns* aColumns, dom::Element* aElement)

    : mContent(aElement), mColumns(aColumns), mIndex(0), mPrevious(nullptr) {

    : mElement(aElement), mColumns(aColumns), mIndex(0), mPrevious(nullptr) {

  NS_ASSERTION(aElement && aElement->NodeInfo()->Equals(nsGkAtoms::treecol,

                                                        kNameSpaceID_XUL),

               "nsTreeColumn's content must be a <xul:treecol>");
@@ -40,14 +40,14 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(nsTreeColumn) 


NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(nsTreeColumn)

  NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mContent)

  NS_IMPL_CYCLE_COLLECTION_UNLINK(mElement)

  if (tmp->mNext) {

    tmp->mNext->SetPrevious(nullptr);

    NS_IMPL_CYCLE_COLLECTION_UNLINK(mNext)

  }

NS_IMPL_CYCLE_COLLECTION_UNLINK_END

NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(nsTreeColumn)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mContent)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mElement)

  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mNext)

NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END

NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(nsTreeColumn)
@@ -62,7 +62,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsTreeColumn) 
  NS_INTERFACE_MAP_ENTRY_CONCRETE(nsTreeColumn)

NS_INTERFACE_MAP_END



nsIFrame* nsTreeColumn::GetFrame() { return mContent->GetPrimaryFrame(); }

nsIFrame* nsTreeColumn::GetFrame() { return mElement->GetPrimaryFrame(); }



bool nsTreeColumn::IsLastVisible(nsTreeBodyFrame* aBodyFrame) {

  NS_ASSERTION(GetFrame(), "should have checked for this already");
@@ -133,7 +133,7 @@ void nsTreeColumn::Invalidate(ErrorResult& aRv) { 
  }



  // Fetch the Id.

  mContent->GetAttr(kNameSpaceID_None, nsGkAtoms::id, mId);

  mElement->GetAttr(kNameSpaceID_None, nsGkAtoms::id, mId);



  // If we have an Id, cache the Id as an atom.

  if (!mId.IsEmpty()) {
@@ -141,7 +141,7 @@ void nsTreeColumn::Invalidate(ErrorResult& aRv) { 
  }



  // Cache our index.

  nsTreeUtils::GetColumnIndex(mContent, &mIndex);

  nsTreeUtils::GetColumnIndex(mElement, &mIndex);



  const nsStyleVisibility* vis = frame->StyleVisibility();
@@ -162,25 +162,25 @@ void nsTreeColumn::Invalidate(ErrorResult& aRv) { 


  // Figure out if we're the primary column (that has to have indentation

  // and twisties drawn.

  mIsPrimary = mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::primary,

  mIsPrimary = mElement->AttrValueIs(kNameSpaceID_None, nsGkAtoms::primary,

                                     nsGkAtoms::_true, eCaseMatters);



  // Figure out if we're a cycling column (one that doesn't cause a selection

  // to happen).

  mIsCycler = mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::cycler,

  mIsCycler = mElement->AttrValueIs(kNameSpaceID_None, nsGkAtoms::cycler,

                                    nsGkAtoms::_true, eCaseMatters);



  mIsEditable = mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::editable,

  mIsEditable = mElement->AttrValueIs(kNameSpaceID_None, nsGkAtoms::editable,

                                      nsGkAtoms::_true, eCaseMatters);



  mOverflow = mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::overflow,

  mOverflow = mElement->AttrValueIs(kNameSpaceID_None, nsGkAtoms::overflow,

                                    nsGkAtoms::_true, eCaseMatters);



  // Figure out our column type. Default type is text.

  mType = TreeColumn_Binding::TYPE_TEXT;

  static Element::AttrValuesArray typestrings[] = {nsGkAtoms::checkbox,

                                                   nullptr};

  switch (mContent->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::type,

  switch (mElement->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::type,

                                    typestrings, eCaseMatters)) {

    case 0:

      mType = TreeColumn_Binding::TYPE_CHECKBOX;
@@ -191,7 +191,7 @@ void nsTreeColumn::Invalidate(ErrorResult& aRv) { 
  mCropStyle = 0;

  static Element::AttrValuesArray cropstrings[] = {

      nsGkAtoms::center, nsGkAtoms::left, nsGkAtoms::start, nullptr};

  switch (mContent->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::crop,

  switch (mElement->FindAttrValueIn(kNameSpaceID_None, nsGkAtoms::crop,

                                    cropstrings, eCaseMatters)) {

    case 0:

      mCropStyle = 1;
@@ -203,7 +203,7 @@ void nsTreeColumn::Invalidate(ErrorResult& aRv) { 
  }

}



nsIContent* nsTreeColumn::GetParentObject() const { return mContent; }

nsIContent* nsTreeColumn::GetParentObject() const { return mElement; }



/* virtual */

JSObject* nsTreeColumn::WrapObject(JSContext* aCx,
@@ -211,7 +211,7 @@ JSObject* nsTreeColumn::WrapObject(JSContext* aCx, 
  return dom::TreeColumn_Binding::Wrap(aCx, this, aGivenProto);

}



Element* nsTreeColumn::Element() { return mContent; }

Element* nsTreeColumn::Element() { return mElement; }



int32_t nsTreeColumn::GetX(mozilla::ErrorResult& aRv) {

  nsIFrame* frame = GetFrame();
@@ -297,7 +297,7 @@ nsTreeColumn* nsTreeColumns::GetSortedColumn() { 
  EnsureColumns();

  for (nsTreeColumn* currCol = mFirstColumn; currCol;

       currCol = currCol->GetNext()) {

    if (nsContentUtils::HasNonEmptyAttr(currCol->mContent, kNameSpaceID_None,

    if (nsContentUtils::HasNonEmptyAttr(currCol->mElement, kNameSpaceID_None,

                                        nsGkAtoms::sortDirection)) {

      return currCol;

    }
@@ -315,7 +315,7 @@ nsTreeColumn* nsTreeColumns::GetKeyColumn() { 
  for (nsTreeColumn* currCol = mFirstColumn; currCol;

       currCol = currCol->GetNext()) {

    // Skip hidden columns.

    if (currCol->mContent->AttrValueIs(kNameSpaceID_None, nsGkAtoms::hidden,

    if (currCol->mElement->AttrValueIs(kNameSpaceID_None, nsGkAtoms::hidden,

                                       nsGkAtoms::_true, eCaseMatters))

      continue;
@@ -324,7 +324,7 @@ nsTreeColumn* nsTreeColumns::GetKeyColumn() { 


    if (!first) first = currCol;



    if (nsContentUtils::HasNonEmptyAttr(currCol->mContent, kNameSpaceID_None,

    if (nsContentUtils::HasNonEmptyAttr(currCol->mElement, kNameSpaceID_None,

                                        nsGkAtoms::sortDirection)) {

      // Use sorted column as the key.

      sorted = currCol;
@@ -344,7 +344,7 @@ nsTreeColumn* nsTreeColumns::GetColumnFor(dom::Element* aElement) { 
  EnsureColumns();

  for (nsTreeColumn* currCol = mFirstColumn; currCol;

       currCol = currCol->GetNext()) {

    if (currCol->mContent == aElement) {

    if (currCol->mElement == aElement) {

      return currCol;

    }

  }

layout/xul/tree/nsTreeColumns.h

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ class nsTreeColumn final : public nsISupports, public nsWrapperCache { 
  /**

   * Non-null nsIContent for the associated <treecol> element.

   */

  RefPtr<mozilla::dom::Element> mContent;

  RefPtr<mozilla::dom::Element> mElement;



  nsTreeColumns* mColumns;