Commit e220fdf5 authored by Masayuki Nakano's avatar Masayuki Nakano
Browse files

Bug 1730442 - part 4: Rewrite `HTMLEditor::GetFirstTableRowElement()` as... 

Bug 1730442 - part 4: Rewrite `HTMLEditor::GetFirstTableRowElement()` as returing `Result<RefPtr<Element>, nsresult>` r=m_kato

This change is tested by `test_nsITableEditor_getFirstRow.html` and
`test_nsITableEditor_insertTableColumn.html`.

Depends on D146361

Differential Revision: https://phabricator.services.mozilla.com/D146362
parent 757378b4

editor/libeditor/HTMLEditor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2718,7 +2718,7 @@ Element* HTMLEditor::GetInclusiveAncestorByTagNameAtSelection( 
}



Element* HTMLEditor::GetInclusiveAncestorByTagNameInternal(

    const nsStaticAtom& aTagName, nsIContent& aContent) const {

    const nsStaticAtom& aTagName, const nsIContent& aContent) const {

  MOZ_ASSERT(&aTagName != nsGkAtoms::_empty);



  Element* currentElement = aContent.GetAsElementOrParentElement();

editor/libeditor/HTMLEditor.h

+8 −11
Original line number Diff line number Diff line
@@ -2891,8 +2891,8 @@ class HTMLEditor final : public EditorBase, 
   * @return                If an element which matches aTagName, returns

   *                        an Element.  Otherwise, nullptr.

   */

  Element* GetInclusiveAncestorByTagNameInternal(const nsStaticAtom& aTagName,

                                                 nsIContent& aContent) const;

  Element* GetInclusiveAncestorByTagNameInternal(

      const nsStaticAtom& aTagName, const nsIContent& aContent) const;



  /**

   * GetSelectedElement() returns a "selected" element node.  "selected" means:
@@ -2928,21 +2928,18 @@ class HTMLEditor final : public EditorBase, 
  /**

   * GetFirstTableRowElement() returns the first <tr> element in the most

   * nearest ancestor of aTableOrElementInTable or itself.

   * When aTableOrElementInTable is neither <table> nor in a <table> element,

   * returns NS_ERROR_FAILURE. However, if <table> does not have <tr> element,

   * returns nullptr.

   *

   * @param aTableOrElementInTable      <table> element or another element.

   *                                    If this is a <table> element, returns

   *                                    first <tr> element in it.  Otherwise,

   *                                    returns first <tr> element in nearest

   *                                    ancestor <table> element.

   * @param aRv                         Returns an error code.  When

   *                                    aTableOrElementInTable is neither

   *                                    <table> nor in a <table> element,

   *                                    returns NS_ERROR_FAILURE.

   *                                    However, if <table> does not have

   *                                    <tr> element, returns NS_OK.

   */

  Element* GetFirstTableRowElement(Element& aTableOrElementInTable,

                                   ErrorResult& aRv) const;

   */

  Result<RefPtr<Element>, nsresult> GetFirstTableRowElement(

      const Element& aTableOrElementInTable) const;



  /**

   * GetNextTableRowElement() returns next <tr> element of aTableRowElement.

editor/libeditor/HTMLTableEditor.cpp

+22 −18
Original line number Diff line number Diff line
@@ -475,18 +475,21 @@ NS_IMETHODIMP HTMLEditor::GetFirstRow(Element* aTableOrElementInTable, 
    return EditorBase::ToGenericNSResult(rv);

  }



  ErrorResult error;

  RefPtr<Element> firstRowElement =

      GetFirstTableRowElement(*aTableOrElementInTable, error);

  NS_WARNING_ASSERTION(!error.Failed(),

  Result<RefPtr<Element>, nsresult> firstRowElementOrError =

      GetFirstTableRowElement(*aTableOrElementInTable);

  NS_WARNING_ASSERTION(!firstRowElementOrError.isErr(),

                       "HTMLEditor::GetFirstTableRowElement() failed");

  firstRowElement.forget(aFirstRowElement);

  return EditorBase::ToGenericNSResult(error.StealNSResult());

  if (firstRowElementOrError.isErr()) {

    NS_WARNING("HTMLEditor::GetFirstTableRowElement() failed");

    return EditorBase::ToGenericNSResult(firstRowElementOrError.unwrapErr());

  }

  firstRowElementOrError.unwrap().forget(aFirstRowElement);

  return NS_OK;

}



Element* HTMLEditor::GetFirstTableRowElement(Element& aTableOrElementInTable,

                                             ErrorResult& aRv) const {

  MOZ_ASSERT(!aRv.Failed());

Result<RefPtr<Element>, nsresult> HTMLEditor::GetFirstTableRowElement(

    const Element& aTableOrElementInTable) const {

  MOZ_ASSERT(IsEditActionDataAvailable());



  Element* tableElement = GetInclusiveAncestorByTagNameInternal(

      *nsGkAtoms::table, aTableOrElementInTable);
@@ -495,15 +498,14 @@ Element* HTMLEditor::GetFirstTableRowElement(Element& aTableOrElementInTable, 
    NS_WARNING(

        "HTMLEditor::GetInclusiveAncestorByTagNameInternal(nsGkAtoms::table) "

        "failed");

    aRv.Throw(NS_ERROR_FAILURE);

    return nullptr;

    return Err(NS_ERROR_FAILURE);

  }



  for (nsIContent* tableChild = tableElement->GetFirstChild(); tableChild;

       tableChild = tableChild->GetNextSibling()) {

    if (tableChild->IsHTMLElement(nsGkAtoms::tr)) {

      // Found a row directly under <table>

      return tableChild->AsElement();

      return RefPtr<Element>(tableChild->AsElement());

    }

    // <table> can have table section elements like <tbody>.  <tr> elements

    // may be children of them.
@@ -513,13 +515,13 @@ Element* HTMLEditor::GetFirstTableRowElement(Element& aTableOrElementInTable, 
           tableSectionChild;

           tableSectionChild = tableSectionChild->GetNextSibling()) {

        if (tableSectionChild->IsHTMLElement(nsGkAtoms::tr)) {

          return tableSectionChild->AsElement();

          return RefPtr<Element>(tableSectionChild->AsElement());

        }

      }

    }

  }

  // Don't return error when there is no <tr> element in the <table>.

  return nullptr;

  return RefPtr<Element>();

}



Element* HTMLEditor::GetNextTableRowElement(Element& aTableRowElement,
@@ -747,15 +749,17 @@ nsresult HTMLEditor::InsertTableColumnsWithTransaction( 


    // Get current row and append new cells after last cell in row

    if (!rowIndex) {

      rowElement = GetFirstTableRowElement(*table, error);

      if (error.Failed()) {

      Result<RefPtr<Element>, nsresult> rowElementOrError =

          GetFirstTableRowElement(*table);

      if (rowElementOrError.isErr()) {

        NS_WARNING("HTMLEditor::GetFirstTableRowElement() failed");

        return error.StealNSResult();

        return rowElementOrError.unwrapErr();

      }

      if (!rowElement) {

      if (!rowElementOrError.inspect()) {

        NS_WARNING("There was no table row");

        continue;

      }

      rowElement = rowElementOrError.unwrap();

    } else {

      if (!rowElement) {

        NS_WARNING("Have not found table row yet");