Commit 1d96fd20 authored by Masayuki Nakano's avatar Masayuki Nakano
Browse files

Bug 1727844 - part 5: Rename some scan result related members in `WSRunObject.h` r=m_kato 

Currently, it uses "normal text" and "normal white-spaces" for naming
`enum class` members and their accessors.  However, this is unclear what
does the normal mean since the word depends on context.

Therefore, this patch replaces the former with "non-collapsible characters" and
the latter is "collapsible white-spaces".

Differential Revision: https://phabricator.services.mozilla.com/D123872
parent 6cc8d22f

editor/libeditor/HTMLEditSubActionHandler.cpp

+4 −4
Original line number Diff line number Diff line
@@ -1915,7 +1915,7 @@ EditActionResult HTMLEditor::SplitMailCiteElements( 
      return EditActionResult(NS_ERROR_FAILURE);

    }

    if (backwardScanFromPointToCreateNewBRElementResult

            .InNormalWhiteSpacesOrText() ||

            .InVisibleOrCollapsibleCharacters() ||

        backwardScanFromPointToCreateNewBRElementResult

            .ReachedSpecialContent()) {

      EditorRawDOMPoint pointAfterNewBRElement(
@@ -1930,7 +1930,7 @@ EditActionResult HTMLEditor::SplitMailCiteElements( 
        return EditActionResult(NS_ERROR_FAILURE);

      }

      if (forwardScanFromPointAfterNewBRElementResult

              .InNormalWhiteSpacesOrText() ||

              .InVisibleOrCollapsibleCharacters() ||

          forwardScanFromPointAfterNewBRElementResult.ReachedSpecialContent() ||

          // In case we're at the very end.

          forwardScanFromPointAfterNewBRElementResult
@@ -5541,7 +5541,7 @@ nsresult HTMLEditor::MaybeExtendSelectionToHardLineEdgesForBlockEditAction() { 
        "WSRunScanner::ScanPreviousVisibleNodeOrBlockBoundaryFrom() failed");

    return NS_ERROR_FAILURE;

  }

  if (scanResultAtEnd.ReachedSomething()) {

  if (scanResultAtEnd.ReachedSomethingNonTextContent()) {

    // eThisBlock and eOtherBlock conveniently distinguish cases

    // of going "down" into a block and "up" out of a block.

    if (wsScannerAtEnd.StartsFromOtherBlockElement()) {
@@ -5578,7 +5578,7 @@ nsresult HTMLEditor::MaybeExtendSelectionToHardLineEdgesForBlockEditAction() { 
    NS_WARNING("WSRunScanner::ScanNextVisibleNodeOrBlockBoundaryFrom() failed");

    return NS_ERROR_FAILURE;

  }

  if (scanResultAtStart.ReachedSomething()) {

  if (scanResultAtStart.ReachedSomethingNonTextContent()) {

    // eThisBlock and eOtherBlock conveniently distinguish cases

    // of going "down" into a block and "up" out of a block.

    if (wsScannerAtStart.EndsByOtherBlockElement()) {

editor/libeditor/HTMLEditUtils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ bool HTMLEditUtils::IsVisibleTextNode( 
  WSScanResult nextWSScanResult =

      WSRunScanner::ScanNextVisibleNodeOrBlockBoundary(

          aEditingHost, EditorRawDOMPoint(&aText, 0));

  return nextWSScanResult.InNormalWhiteSpacesOrText() &&

  return nextWSScanResult.InVisibleOrCollapsibleCharacters() &&

         nextWSScanResult.TextPtr() == &aText;

}

editor/libeditor/HTMLEditor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -817,7 +817,7 @@ nsresult HTMLEditor::MaybeCollapseSelectionAtFirstEditableNode( 
      WSScanResult scanResultInTextNode =

          WSRunScanner::ScanNextVisibleNodeOrBlockBoundary(

              editingHost, EditorRawDOMPoint(text, 0));

      if (scanResultInTextNode.InNormalWhiteSpacesOrText() &&

      if (scanResultInTextNode.InVisibleOrCollapsibleCharacters() &&

          scanResultInTextNode.TextPtr() == text) {

        nsresult rv = CollapseSelectionTo(scanResultInTextNode.Point());

        NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),

editor/libeditor/HTMLEditorDataTransfer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -447,7 +447,7 @@ HTMLEditor::HTMLWithContextInserter::GetNewCaretPointAfterInsertingHTML( 
    WSScanResult backwardScanFromPointToCaretResult =

        wsRunScannerAtStartReason.ScanPreviousVisibleNodeOrBlockBoundaryFrom(

            pointToPutCaret);

    if (backwardScanFromPointToCaretResult.InNormalWhiteSpacesOrText()) {

    if (backwardScanFromPointToCaretResult.InVisibleOrCollapsibleCharacters()) {

      pointToPutCaret = backwardScanFromPointToCaretResult.Point();

    } else if (backwardScanFromPointToCaretResult.ReachedSpecialContent()) {

      // XXX In my understanding, this is odd.  The end reason may not be

editor/libeditor/HTMLEditorDeleteHandler.cpp

+6 −6
Original line number Diff line number Diff line
@@ -1652,8 +1652,8 @@ HTMLEditor::AutoDeleteRangesHandler::ComputeRangesToDeleteAroundCollapsedRanges( 
    const HTMLEditor& aHTMLEditor, nsIEditor::EDirection aDirectionAndAmount,

    AutoRangeArray& aRangesToDelete, const WSRunScanner& aWSRunScannerAtCaret,

    const WSScanResult& aScanFromCaretPointResult) const {

  if (aScanFromCaretPointResult.InNormalWhiteSpaces() ||

      aScanFromCaretPointResult.InNormalText()) {

  if (aScanFromCaretPointResult.InCollapsibleWhiteSpaces() ||

      aScanFromCaretPointResult.InNonCollapsibleCharacters()) {

    nsresult rv = aRangesToDelete.Collapse(aScanFromCaretPointResult.Point());

    if (NS_FAILED(rv)) {

      NS_WARNING("AutoRangeArray::Collapse() failed");
@@ -1766,8 +1766,8 @@ HTMLEditor::AutoDeleteRangesHandler::HandleDeleteAroundCollapsedRanges( 
      EditorType::HTML));



  if (StaticPrefs::editor_white_space_normalization_blink_compatible()) {

    if (aScanFromCaretPointResult.InNormalWhiteSpaces() ||

        aScanFromCaretPointResult.InNormalText()) {

    if (aScanFromCaretPointResult.InCollapsibleWhiteSpaces() ||

        aScanFromCaretPointResult.InNonCollapsibleCharacters()) {

      nsresult rv = aRangesToDelete.Collapse(aScanFromCaretPointResult.Point());

      if (NS_FAILED(rv)) {

        NS_WARNING("AutoRangeArray::Collapse() failed");
@@ -1782,7 +1782,7 @@ HTMLEditor::AutoDeleteRangesHandler::HandleDeleteAroundCollapsedRanges( 
    }

  }



  if (aScanFromCaretPointResult.InNormalWhiteSpaces()) {

  if (aScanFromCaretPointResult.InCollapsibleWhiteSpaces()) {

    EditActionResult result = HandleDeleteCollapsedSelectionAtWhiteSpaces(

        aHTMLEditor, aDirectionAndAmount, aWSRunScannerAtCaret.ScanStartRef());

    NS_WARNING_ASSERTION(result.Succeeded(),
@@ -1792,7 +1792,7 @@ HTMLEditor::AutoDeleteRangesHandler::HandleDeleteAroundCollapsedRanges( 
    return result;

  }



  if (aScanFromCaretPointResult.InNormalText()) {

  if (aScanFromCaretPointResult.InNonCollapsibleCharacters()) {

    if (NS_WARN_IF(!aScanFromCaretPointResult.GetContent()->IsText())) {

      return EditActionResult(NS_ERROR_FAILURE);

    }