Commit 8cd9308e authored by Masayuki Nakano's avatar Masayuki Nakano
Browse files

Bug 1741148 - part 7: Make `AdjustRangeForSelection()` in... 

Bug 1741148 - part 7: Make `AdjustRangeForSelection()` in `ContentEventHandler.cpp` use `Maybe<uint32_t>` for treating offset in a DOM node r=smaug

Differential Revision: https://phabricator.services.mozilla.com/D131340
parent a34452e3

dom/events/ContentEventHandler.cpp

+28 −14
Original line number Diff line number Diff line
@@ -2973,9 +2973,9 @@ nsresult ContentEventHandler::ConvertToRootRelativeOffset(nsIFrame* aFrame, 
}



static void AdjustRangeForSelection(nsIContent* aRoot, nsINode** aNode,

                                    int32_t* aNodeOffset) {

                                    Maybe<uint32_t>* aNodeOffset) {

  nsINode* node = *aNode;

  int32_t nodeOffset = *aNodeOffset;

  Maybe<uint32_t> nodeOffset = *aNodeOffset;

  if (aRoot == node || NS_WARN_IF(!node->GetParent()) || !node->IsText()) {

    return;

  }
@@ -2983,9 +2983,10 @@ static void AdjustRangeForSelection(nsIContent* aRoot, nsINode** aNode, 
  // When the offset is at the end of the text node, set it to after the

  // text node, to make sure the caret is drawn on a new line when the last

  // character of the text node is '\n' in <textarea>.

  int32_t textLength = static_cast<int32_t>(node->AsContent()->TextLength());

  MOZ_ASSERT(nodeOffset <= textLength, "Offset is past length of text node");

  if (nodeOffset != textLength) {

  const uint32_t textLength = node->AsContent()->TextLength();

  MOZ_ASSERT(nodeOffset.isNothing() || *nodeOffset <= textLength,

             "Offset is past length of text node");

  if (nodeOffset.isNothing() || *nodeOffset != textLength) {

    return;

  }
@@ -3001,9 +3002,21 @@ static void AdjustRangeForSelection(nsIContent* aRoot, nsINode** aNode, 
    return;

  }



  // If the node is being removed from its parent, it holds the ex-parent,

  // but the parent have already removed the child from its child chain.

  // Therefore `ComputeIndexOf` may fail, but I don't want to make Beta/Nightly

  // crash at accessing `Maybe::operator*` so that here checks `isSome`, but

  // crashing only in debug builds may help to debug something complicated

  // situation, therefore, `MOZ_ASSERT` is put here.

  *aNode = node->GetParent();

  MOZ_ASSERT((*aNode)->ComputeIndexOf(node).isSome());

  *aNodeOffset = (*aNode)->ComputeIndexOf_Deprecated(node) + 1;

  Maybe<uint32_t> index = (*aNode)->ComputeIndexOf(node);

  MOZ_ASSERT(index.isSome());

  if (index.isSome()) {

    MOZ_ASSERT(*index != UINT32_MAX);

    *aNodeOffset = Some(*index + 1u);

  } else {

    *aNodeOffset = Some(0u);

  }

}



nsresult ContentEventHandler::OnSelectionEvent(WidgetSelectionEvent* aEvent) {
@@ -3032,12 +3045,13 @@ nsresult ContentEventHandler::OnSelectionEvent(WidgetSelectionEvent* aEvent) { 


  nsINode* startNode = rawRange.GetStartContainer();

  nsINode* endNode = rawRange.GetEndContainer();

  int32_t startNodeOffset = rawRange.StartOffset();

  int32_t endNodeOffset = rawRange.EndOffset();

  Maybe<uint32_t> startNodeOffset = Some(rawRange.StartOffset());

  Maybe<uint32_t> endNodeOffset = Some(rawRange.EndOffset());

  AdjustRangeForSelection(mRootContent, &startNode, &startNodeOffset);

  AdjustRangeForSelection(mRootContent, &endNode, &endNodeOffset);

  if (NS_WARN_IF(!startNode) || NS_WARN_IF(!endNode) ||

      NS_WARN_IF(startNodeOffset < 0) || NS_WARN_IF(endNodeOffset < 0)) {

      NS_WARN_IF(startNodeOffset.isNothing()) ||

      NS_WARN_IF(endNodeOffset.isNothing())) {

    return NS_ERROR_UNEXPECTED;

  }
@@ -3046,8 +3060,8 @@ nsresult ContentEventHandler::OnSelectionEvent(WidgetSelectionEvent* aEvent) { 
    nsCOMPtr<nsINode> endNodeStrong(endNode);

    ErrorResult error;

    MOZ_KnownLive(mSelection)

        ->SetBaseAndExtentInLimiter(*endNodeStrong, endNodeOffset,

                                    *startNodeStrong, startNodeOffset, error);

        ->SetBaseAndExtentInLimiter(*endNodeStrong, *endNodeOffset,

                                    *startNodeStrong, *startNodeOffset, error);

    if (NS_WARN_IF(error.Failed())) {

      return error.StealNSResult();

    }
@@ -3056,8 +3070,8 @@ nsresult ContentEventHandler::OnSelectionEvent(WidgetSelectionEvent* aEvent) { 
    nsCOMPtr<nsINode> endNodeStrong(endNode);

    ErrorResult error;

    MOZ_KnownLive(mSelection)

        ->SetBaseAndExtentInLimiter(*startNodeStrong, startNodeOffset,

                                    *endNodeStrong, endNodeOffset, error);

        ->SetBaseAndExtentInLimiter(*startNodeStrong, *startNodeOffset,

                                    *endNodeStrong, *endNodeOffset, error);

    if (NS_WARN_IF(error.Failed())) {

      return error.StealNSResult();

    }