mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1623413 - Part 2: Rename Collapse() to CollapseInLimiter() r=masayuki 

Depends on D88702

Differential Revision: https://phabricator.services.mozilla.com/D88920
This commit is contained in:
Kagami Sascha Rosylight 2020-09-03 03:45:26 +00:00
Родитель 8fb6badd8c
Коммит 11ef0ef23e
21 изменённых файлов: 113 добавлений и 92 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
dom/base/Selection.cpp
Просмотреть файл

@ -2186,7 +2186,7 @@ void Selection::CollapseToStart(ErrorResult& aRv) {
aRv.Throw(NS_ERROR_FAILURE);
return;
}
Collapse(*container, firstRange->StartOffset(), aRv);
CollapseInLimiter(*container, firstRange->StartOffset(), aRv);
}
/*
@ -2222,7 +2222,7 @@ void Selection::CollapseToEnd(ErrorResult& aRv) {
aRv.Throw(NS_ERROR_FAILURE);
return;
}
Collapse(*container, lastRange->EndOffset(), aRv);
CollapseInLimiter(*container, lastRange->EndOffset(), aRv);
}
void Selection::GetType(nsAString& aOutType) const {
@ -3198,7 +3198,7 @@ void Selection::DeleteFromDocument(ErrorResult& aRv) {
// If we deleted one character, then we move back one element.
// FIXME We don't know how to do this past frame boundaries yet.
if (AnchorOffset() > 0) {
Collapse(GetAnchorNode(), AnchorOffset());
CollapseInLimiter(GetAnchorNode(), AnchorOffset());
}
#ifdef DEBUG
else {
@ -3275,7 +3275,7 @@ void Selection::Modify(const nsAString& aAlter, const nsAString& aDirection,
return;
}
uint32_t focusOffset = FocusOffset();
Collapse(focusNode, focusOffset);
CollapseInLimiter(focusNode, focusOffset);
}
// If the paragraph direction of the focused frame is right-to-left,

16
dom/base/Selection.h
Просмотреть файл

@ -190,18 +190,18 @@ class Selection final : public nsSupportsWeakReference,
public:
nsresult RemoveCollapsedRanges();
nsresult Clear(nsPresContext* aPresContext);
nsresult Collapse(nsINode* aContainer, int32_t aOffset) {
nsresult CollapseInLimiter(nsINode* aContainer, int32_t aOffset) {
if (!aContainer) {
return NS_ERROR_INVALID_ARG;
}
return Collapse(RawRangeBoundary(aContainer, aOffset));
return CollapseInLimiter(RawRangeBoundary(aContainer, aOffset));
}
nsresult Collapse(const RawRangeBoundary& aPoint) {
nsresult CollapseInLimiter(const RawRangeBoundary& aPoint) {
ErrorResult result;
Collapse(aPoint, result);
CollapseInLimiter(aPoint, result);
return result.StealNSResult();
}
void Collapse(const RawRangeBoundary& aPoint, ErrorResult& aRv) {
void CollapseInLimiter(const RawRangeBoundary& aPoint, ErrorResult& aRv) {
CollapseInternal(InLimiter::eYes, aPoint, aRv);
}
@ -438,9 +438,9 @@ class Selection final : public nsSupportsWeakReference,
*/
// TODO: mark as `MOZ_CAN_RUN_SCRIPT`
// (https://bugzilla.mozilla.org/show_bug.cgi?id=1615296).
MOZ_CAN_RUN_SCRIPT_BOUNDARY void Collapse(nsINode& aContainer,
uint32_t aOffset,
ErrorResult& aRv) {
MOZ_CAN_RUN_SCRIPT_BOUNDARY void CollapseInLimiter(nsINode& aContainer,
uint32_t aOffset,
ErrorResult& aRv) {
CollapseInternal(InLimiter::eYes, RawRangeBoundary(&aContainer, aOffset),
aRv);
}

2
dom/events/EventStateManager.cpp
Просмотреть файл

@ -5230,7 +5230,7 @@ nsresult EventStateManager::HandleMiddleClickPaste(
// designMode editor is clicked, the point is in the editor.
// However, outer HTMLEditor and Selection should handle it.
// So, in such case, Selection::Collapse() will fail.
DebugOnly<nsresult> rv = selection->Collapse(container, offset);
DebugOnly<nsresult> rv = selection->CollapseInLimiter(container, offset);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"Failed to collapse Selection at middle clicked");
}

13
editor/libeditor/CompositionTransaction.cpp
Просмотреть файл

@ -179,8 +179,8 @@ NS_IMETHODIMP CompositionTransaction::UndoTransaction() {
}
// set the selection to the insertion point where the string was removed
nsresult rv = selection->Collapse(textNode, mOffset);
NS_ASSERTION(NS_SUCCEEDED(rv), "Selection::Collapse() failed");
nsresult rv = selection->CollapseInLimiter(textNode, mOffset);
NS_ASSERTION(NS_SUCCEEDED(rv), "Selection::CollapseInLimiter() failed");
return rv;
}
@ -299,10 +299,10 @@ nsresult CompositionTransaction::SetIMESelection(
std::min(textRange.mStartOffset, aLengthOfCompositionString));
MOZ_ASSERT(caretOffset >= 0 &&
static_cast<uint32_t>(caretOffset) <= maxOffset);
rv = selection->Collapse(aTextNode, caretOffset);
rv = selection->CollapseInLimiter(aTextNode, caretOffset);
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rv),
"Selection::Collapse() failed, but might be ignored");
"Selection::CollapseInLimiter() failed, but might be ignored");
setCaret = setCaret || NS_SUCCEEDED(rv);
if (!setCaret) {
continue;
@ -372,8 +372,9 @@ nsresult CompositionTransaction::SetIMESelection(
static_cast<int32_t>(aOffsetInNode + aLengthOfCompositionString);
MOZ_ASSERT(caretOffset >= 0 &&
static_cast<uint32_t>(caretOffset) <= maxOffset);
rv = selection->Collapse(aTextNode, caretOffset);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Selection::Collapse() failed");
rv = selection->CollapseInLimiter(aTextNode, caretOffset);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"Selection::CollapseInLimiter() failed");
// If caret range isn't specified explicitly, we should hide the caret.
// Hiding the caret benefits a Windows build (see bug 555642 comment #6).

4
editor/libeditor/CreateElementTransaction.cpp
Просмотреть файл

@ -119,9 +119,9 @@ NS_IMETHODIMP CreateElementTransaction::DoTransaction() {
return NS_ERROR_FAILURE;
}
IgnoredErrorResult ignoredError;
selection->Collapse(afterNewNode, ignoredError);
selection->CollapseInLimiter(afterNewNode, ignoredError);
NS_WARNING_ASSERTION(!ignoredError.Failed(),
"Selection::Collapse() failed, but ignored");
"Selection::CollapseInLimiter() failed, but ignored");
return NS_OK;
}

5
editor/libeditor/DeleteRangeTransaction.cpp
Просмотреть файл

@ -98,8 +98,9 @@ NS_IMETHODIMP DeleteRangeTransaction::DoTransaction() {
if (NS_WARN_IF(!selection)) {
return NS_ERROR_NOT_INITIALIZED;
}
rv = selection->Collapse(startRef.AsRaw());
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Selection::Collapsed() failed");
rv = selection->CollapseInLimiter(startRef.AsRaw());
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"Selection::CollapseInLimiter() failed");
return rv;
}

5
editor/libeditor/DeleteTextTransaction.cpp
Просмотреть файл

@ -131,8 +131,9 @@ NS_IMETHODIMP DeleteTextTransaction::DoTransaction() {
if (NS_WARN_IF(!selection)) {
return NS_ERROR_FAILURE;
}
selection->Collapse(EditorRawDOMPoint(textNode, mOffset), error);
NS_WARNING_ASSERTION(!error.Failed(), "Selection::Collapse() failed");
selection->CollapseInLimiter(EditorRawDOMPoint(textNode, mOffset), error);
NS_WARNING_ASSERTION(!error.Failed(),
"Selection::CollapseInLimiter() failed");
return error.StealNSResult();
}

31
editor/libeditor/EditorBase.cpp
Просмотреть файл

@ -1115,15 +1115,17 @@ NS_IMETHODIMP EditorBase::BeginningOfDocument() {
nsCOMPtr<nsINode> firstNode = GetFirstEditableNode(rootElement);
if (!firstNode) {
// just the root node, set selection to inside the root
nsresult rv = SelectionRefPtr()->Collapse(rootElement, 0);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Selection::Collapse() failed");
nsresult rv = SelectionRefPtr()->CollapseInLimiter(rootElement, 0);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"Selection::CollapseInLimiter() failed");
return rv;
}
if (firstNode->IsText()) {
// If firstNode is text, set selection to beginning of the text node.
nsresult rv = SelectionRefPtr()->Collapse(firstNode, 0);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Selection::Collapse() failed");
nsresult rv = SelectionRefPtr()->CollapseInLimiter(firstNode, 0);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"Selection::CollapseInLimiter() failed");
return rv;
}
@ -1136,8 +1138,9 @@ NS_IMETHODIMP EditorBase::BeginningOfDocument() {
MOZ_ASSERT(
parent->ComputeIndexOf(firstNode) == 0,
"How come the first node isn't the left most child in its parent?");
nsresult rv = SelectionRefPtr()->Collapse(parent, 0);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Selection::Collapse() failed");
nsresult rv = SelectionRefPtr()->CollapseInLimiter(parent, 0);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"Selection::CollapseInLimiter() failed");
return rv;
}
@ -1176,9 +1179,10 @@ nsresult EditorBase::CollapseSelectionToEnd() const {
}
uint32_t length = lastContent->Length();
nsresult rv =
SelectionRefPtr()->Collapse(lastContent, static_cast<int32_t>(length));
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Selection::Collapse() failed");
nsresult rv = SelectionRefPtr()->CollapseInLimiter(
lastContent, static_cast<int32_t>(length));
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"Selection::CollapseInLimiter() failed");
return rv;
}
@ -2707,12 +2711,12 @@ nsresult EditorBase::SetTextNodeWithoutTransaction(const nsAString& aString,
}
DebugOnly<nsresult> rvIgnored =
SelectionRefPtr()->Collapse(&aTextNode, aString.Length());
SelectionRefPtr()->CollapseInLimiter(&aTextNode, aString.Length());
if (NS_WARN_IF(Destroyed())) {
return NS_ERROR_EDITOR_DESTROYED;
}
NS_ASSERTION(NS_SUCCEEDED(rvIgnored),
"Selection::Collapse() failed, but ignored");
"Selection::CollapseInLimiter() failed, but ignored");
RangeUpdaterRef().SelAdjReplaceText(aTextNode, 0, length, aString.Length());
@ -3237,12 +3241,13 @@ nsresult EditorBase::MaybeCreatePaddingBRElementForEmptyEditor() {
}
// Set selection.
SelectionRefPtr()->Collapse(EditorRawDOMPoint(rootElement, 0), ignoredError);
SelectionRefPtr()->CollapseInLimiter(EditorRawDOMPoint(rootElement, 0),
ignoredError);
if (NS_WARN_IF(Destroyed())) {
return NS_ERROR_EDITOR_DESTROYED;
}
NS_WARNING_ASSERTION(!ignoredError.Failed(),
"Selection::Collapse() failed, but ignored");
"Selection::CollapseInLimiter() failed, but ignored");
return NS_OK;
}

5
editor/libeditor/HTMLEditSubActionHandler.cpp
Просмотреть файл

@ -3604,8 +3604,9 @@ HTMLEditor::AutoDeleteRangesHandler::HandleDeleteTextAroundCollapsedSelection(
const EditorDOMPoint& newCaretPosition = result.inspect();
MOZ_ASSERT(newCaretPosition.IsSetAndValid());
DebugOnly<nsresult> rvIgnored = aHTMLEditor.SelectionRefPtr()->Collapse(
newCaretPosition.ToRawRangeBoundary());
DebugOnly<nsresult> rvIgnored =
aHTMLEditor.SelectionRefPtr()->CollapseInLimiter(
newCaretPosition.ToRawRangeBoundary());
NS_WARNING_ASSERTION(NS_SUCCEEDED(rvIgnored),
"Selection::Collapse() failed, but ignored");
return EditActionHandled();

23
editor/libeditor/HTMLEditor.cpp
Просмотреть файл

@ -4679,13 +4679,13 @@ nsresult HTMLEditor::DoJoinNodes(nsIContent& aContentToKeep,
if (allowedTransactionsToChangeSelection) {
// Editor wants us to set selection at join point.
DebugOnly<nsresult> rvIgnored = SelectionRefPtr()->Collapse(
DebugOnly<nsresult> rvIgnored = SelectionRefPtr()->CollapseInLimiter(
&aContentToKeep, AssertedCast<int32_t>(firstNodeLength));
if (NS_WARN_IF(Destroyed())) {
return NS_ERROR_EDITOR_DESTROYED;
}
NS_WARNING_ASSERTION(NS_SUCCEEDED(rvIgnored),
"Selection::Collapse() failed, but ignored");
"Selection::CollapseInLimiter() failed, but ignored");
}
return NS_OK;
@ -4765,9 +4765,9 @@ already_AddRefed<Element> HTMLEditor::DeleteSelectionAndCreateElement(
EditorRawDOMPoint afterNewElement(EditorRawDOMPoint::After(newElement));
MOZ_ASSERT(afterNewElement.IsSetAndValid());
IgnoredErrorResult ignoredError;
SelectionRefPtr()->Collapse(afterNewElement, ignoredError);
SelectionRefPtr()->CollapseInLimiter(afterNewElement, ignoredError);
if (ignoredError.Failed()) {
NS_WARNING("Selection::Collapse() failed");
NS_WARNING("Selection::CollapseInLimiter() failed");
// XXX Even if it succeeded to create new element, this returns error
// when Selection.Collapse() fails something. This could occur with
// mutation observer or mutation event listener.
@ -4813,8 +4813,9 @@ nsresult HTMLEditor::DeleteSelectionAndPrepareToCreateNode() {
return NS_ERROR_FAILURE;
}
ErrorResult error;
SelectionRefPtr()->Collapse(atAnchorContainer, error);
NS_WARNING_ASSERTION(!error.Failed(), "Selection::Collapse() failed");
SelectionRefPtr()->CollapseInLimiter(atAnchorContainer, error);
NS_WARNING_ASSERTION(!error.Failed(),
"Selection::CollapseInLimiter() failed");
return error.StealNSResult();
}
@ -4824,8 +4825,9 @@ nsresult HTMLEditor::DeleteSelectionAndPrepareToCreateNode() {
return NS_ERROR_FAILURE;
}
ErrorResult error;
SelectionRefPtr()->Collapse(afterAnchorContainer, error);
NS_WARNING_ASSERTION(!error.Failed(), "Selection::Collapse() failed");
SelectionRefPtr()->CollapseInLimiter(afterAnchorContainer, error);
NS_WARNING_ASSERTION(!error.Failed(),
"Selection::CollapseInLimiter() failed");
return error.StealNSResult();
}
@ -4841,8 +4843,9 @@ nsresult HTMLEditor::DeleteSelectionAndPrepareToCreateNode() {
return NS_ERROR_FAILURE;
}
MOZ_ASSERT(atRightNode.IsSetAndValid());
SelectionRefPtr()->Collapse(atRightNode, error);
NS_WARNING_ASSERTION(!error.Failed(), "Selection::Collapse() failed");
SelectionRefPtr()->CollapseInLimiter(atRightNode, error);
NS_WARNING_ASSERTION(!error.Failed(),
"Selection::CollapseInLimiter() failed");
return error.StealNSResult();
}

5
editor/libeditor/HTMLEditor.h
Просмотреть файл

@ -3029,12 +3029,13 @@ class HTMLEditor final : public TextEditor,
MOZ_ASSERT(IsEditActionDataAvailable());
MOZ_ASSERT(!aRv.Failed());
SelectionRefPtr()->Collapse(aPoint, aRv);
SelectionRefPtr()->CollapseInLimiter(aPoint, aRv);
if (NS_WARN_IF(Destroyed())) {
aRv = NS_ERROR_EDITOR_DESTROYED;
return;
}
NS_WARNING_ASSERTION(!aRv.Failed(), "Selection::Collapse() failed");
NS_WARNING_ASSERTION(!aRv.Failed(),
"Selection::CollapseInLimiter() failed");
}
[[nodiscard]] MOZ_CAN_RUN_SCRIPT MOZ_NEVER_INLINE_DEBUG nsresult

5
editor/libeditor/HTMLEditorEventListener.cpp
Просмотреть файл

@ -354,9 +354,10 @@ nsresult HTMLEditorEventListener::HandleSecondaryMouseButtonDown(
NS_WARNING_ASSERTION(NS_SUCCEEDED(rvIgnored),
"HTMLEditor::SelectElement() failed, but ignored");
} else {
DebugOnly<nsresult> rvIgnored = selection->Collapse(parentContent, offset);
DebugOnly<nsresult> rvIgnored =
selection->CollapseInLimiter(parentContent, offset);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rvIgnored),
"Selection::Collapse() failed, but ignored");
"Selection::CollapseInLimiter() failed, but ignored");
}
// HACK !!! Context click places the caret but the context menu consumes

4
editor/libeditor/InsertNodeTransaction.cpp
Просмотреть файл

@ -141,9 +141,9 @@ NS_IMETHODIMP InsertNodeTransaction::DoTransaction() {
NS_WARNING_ASSERTION(afterInsertedNode.IsSet(),
"Failed to set after the inserted node");
IgnoredErrorResult ignoredError;
selection->Collapse(afterInsertedNode, ignoredError);
selection->CollapseInLimiter(afterInsertedNode, ignoredError);
NS_WARNING_ASSERTION(!ignoredError.Failed(),
"Selection::Collapse() failed, but ignored");
"Selection::CollapseInLimiter() failed, but ignored");
return NS_OK;
}

6
editor/libeditor/InsertTextTransaction.cpp
Просмотреть файл

@ -65,10 +65,10 @@ NS_IMETHODIMP InsertTextTransaction::DoTransaction() {
if (NS_WARN_IF(!selection)) {
return NS_ERROR_FAILURE;
}
DebugOnly<nsresult> rvIgnored =
selection->Collapse(textNode, mOffset + mStringToInsert.Length());
DebugOnly<nsresult> rvIgnored = selection->CollapseInLimiter(
textNode, mOffset + mStringToInsert.Length());
NS_ASSERTION(NS_SUCCEEDED(rvIgnored),
"Selection::Collapse() failed, but ignored");
"Selection::CollapseInLimiter() failed, but ignored");
} else {
// Do nothing - DOM Range gravity will adjust selection
}

18
editor/libeditor/ReplaceTextTransaction.cpp
Просмотреть файл

@ -52,13 +52,13 @@ NS_IMETHODIMP ReplaceTextTransaction::DoTransaction() {
if (NS_WARN_IF(!selection)) {
return NS_ERROR_FAILURE;
}
DebugOnly<nsresult> rvIgnored =
selection->Collapse(textNode, mOffset + mStringToInsert.Length());
DebugOnly<nsresult> rvIgnored = selection->CollapseInLimiter(
textNode, mOffset + mStringToInsert.Length());
if (NS_WARN_IF(editorBase->Destroyed())) {
return NS_ERROR_EDITOR_DESTROYED;
}
NS_ASSERTION(NS_SUCCEEDED(rvIgnored),
"Selection::Collapse() failed, but ignored");
"Selection::CollapseInLimiter() failed, but ignored");
return NS_OK;
}
@ -107,13 +107,13 @@ NS_IMETHODIMP ReplaceTextTransaction::UndoTransaction() {
if (NS_WARN_IF(!selection)) {
return NS_ERROR_FAILURE;
}
DebugOnly<nsresult> rvIgnored =
selection->Collapse(textNode, mOffset + mStringToBeReplaced.Length());
DebugOnly<nsresult> rvIgnored = selection->CollapseInLimiter(
textNode, mOffset + mStringToBeReplaced.Length());
if (NS_WARN_IF(editorBase->Destroyed())) {
return NS_ERROR_EDITOR_DESTROYED;
}
NS_ASSERTION(NS_SUCCEEDED(rvIgnored),
"Selection::Collapse() failed, but ignored");
"Selection::CollapseInLimiter() failed, but ignored");
return NS_OK;
}
@ -162,13 +162,13 @@ NS_IMETHODIMP ReplaceTextTransaction::RedoTransaction() {
if (NS_WARN_IF(!selection)) {
return NS_ERROR_FAILURE;
}
DebugOnly<nsresult> rvIgnored =
selection->Collapse(textNode, mOffset + mStringToInsert.Length());
DebugOnly<nsresult> rvIgnored = selection->CollapseInLimiter(
textNode, mOffset + mStringToInsert.Length());
if (NS_WARN_IF(editorBase->Destroyed())) {
return NS_ERROR_EDITOR_DESTROYED;
}
NS_ASSERTION(NS_SUCCEEDED(rvIgnored),
"Selection::Collapse() failed, but ignored");
"Selection::CollapseInLimiter() failed, but ignored");
return NS_OK;
}

5
editor/libeditor/SplitNodeTransaction.cpp
Просмотреть файл

@ -112,8 +112,9 @@ NS_IMETHODIMP SplitNodeTransaction::DoTransaction() {
return NS_ERROR_FAILURE;
}
EditorRawDOMPoint atEndOfLeftNode(EditorRawDOMPoint::AtEndOf(newLeftContent));
selection->Collapse(atEndOfLeftNode, error);
NS_WARNING_ASSERTION(!error.Failed(), "Selection::Collapse() failed");
selection->CollapseInLimiter(atEndOfLeftNode, error);
NS_WARNING_ASSERTION(!error.Failed(),
"Selection::CollapseInLimiter() failed");
return error.StealNSResult();
}

17
editor/libeditor/TextEditSubActionHandler.cpp
Просмотреть файл

@ -266,9 +266,9 @@ EditActionResult TextEditor::InsertLineFeedCharacterAtSelection() {
!pointAfterInsertedLineFeed.GetChild(),
"After inserting text into a text node, pointAfterInsertedLineFeed."
"GetChild() should be nullptr");
rv = SelectionRefPtr()->Collapse(pointAfterInsertedLineFeed);
rv = SelectionRefPtr()->CollapseInLimiter(pointAfterInsertedLineFeed);
if (NS_FAILED(rv)) {
NS_WARNING("Selection::Collapse() failed");
NS_WARNING("Selection::CollapseInLimiter() failed");
return EditActionIgnored(rv);
}
@ -346,11 +346,12 @@ nsresult TextEditor::EnsureCaretNotAtEndOfTextNode() {
return NS_ERROR_FAILURE;
}
IgnoredErrorResult ignoredError;
SelectionRefPtr()->Collapse(afterStartContainer, ignoredError);
SelectionRefPtr()->CollapseInLimiter(afterStartContainer, ignoredError);
if (NS_WARN_IF(Destroyed())) {
return NS_ERROR_EDITOR_DESTROYED;
}
NS_WARNING_ASSERTION(!ignoredError.Failed(), "Selection::Collapse() failed");
NS_WARNING_ASSERTION(!ignoredError.Failed(),
"Selection::CollapseInLimiter() failed");
return ignoredError.StealNSResult();
}
@ -589,12 +590,14 @@ EditActionResult TextEditor::HandleInsertText(
"After inserting text into a text node, pointAfterStringInserted."
"GetChild() should be nullptr");
ignoredError = IgnoredErrorResult();
SelectionRefPtr()->Collapse(pointAfterStringInserted, ignoredError);
SelectionRefPtr()->CollapseInLimiter(pointAfterStringInserted,
ignoredError);
if (NS_WARN_IF(Destroyed())) {
return EditActionHandled(NS_ERROR_EDITOR_DESTROYED);
}
NS_WARNING_ASSERTION(!ignoredError.Failed(),
"Selection::Collapse() failed, but ignored");
NS_WARNING_ASSERTION(
!ignoredError.Failed(),
"Selection::CollapseInLimiter() failed, but ignored");
}
}

12
editor/libeditor/TextEditor.cpp
Просмотреть файл

@ -598,9 +598,10 @@ nsresult TextEditor::SetTextAsSubAction(const nsAString& aString) {
// we can saving the expensive cost of modifying `Selection` here.
nsresult rv;
if (IsEmpty()) {
rv = SelectionRefPtr()->Collapse(rootElement, 0);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"Selection::Collapse() failed, but ignored");
rv = SelectionRefPtr()->CollapseInLimiter(rootElement, 0);
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rv),
"Selection::CollapseInLimiter() failed, but ignored");
} else {
// XXX Oh, we shouldn't select padding `<br>` element for empty last
// line here since we will need to recreate it in multiline
@ -1545,8 +1546,9 @@ nsresult TextEditor::SelectEntireDocument() {
// If we're empty, don't select all children because that would select the
// padding <br> element for empty editor.
if (IsEmpty()) {
nsresult rv = SelectionRefPtr()->Collapse(anonymousDivElement, 0);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Selection::Collapse() failed");
nsresult rv = SelectionRefPtr()->CollapseInLimiter(anonymousDivElement, 0);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
"Selection::CollapseInLimiter() failed");
return rv;
}

5
editor/libeditor/TextEditorDataTransfer.cpp
Просмотреть файл

@ -105,11 +105,12 @@ nsresult TextEditor::PrepareToInsertContent(
}
IgnoredErrorResult error;
SelectionRefPtr()->Collapse(pointToInsert, error);
SelectionRefPtr()->CollapseInLimiter(pointToInsert, error);
if (NS_WARN_IF(Destroyed())) {
return NS_ERROR_EDITOR_DESTROYED;
}
NS_WARNING_ASSERTION(!error.Failed(), "Selection::Collapse() failed");
NS_WARNING_ASSERTION(!error.Failed(),
"Selection::CollapseInLimiter() failed");
return error.StealNSResult();
}

8
editor/spellchecker/TextServicesDocument.cpp
Просмотреть файл

@ -1188,8 +1188,8 @@ nsresult TextServicesDocument::InsertText(const nsAString& aText) {
return rv;
}
rv = selection->Collapse(itEntry->mNode,
itEntry->mNodeOffset + itEntry->mLength);
rv = selection->CollapseInLimiter(itEntry->mNode,
itEntry->mNodeOffset + itEntry->mLength);
if (NS_FAILED(rv)) {
return rv;
@ -1757,7 +1757,7 @@ nsresult TextServicesDocument::SetSelectionInternal(int32_t aOffset,
if (!aLength) {
if (aDoUpdate) {
nsresult rv = selection->Collapse(startNode, startNodeOffset);
nsresult rv = selection->CollapseInLimiter(startNode, startNodeOffset);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
@ -1801,7 +1801,7 @@ nsresult TextServicesDocument::SetSelectionInternal(int32_t aOffset,
}
if (!endNode) {
nsresult rv = selection->Collapse(startNode, startNodeOffset);
nsresult rv = selection->CollapseInLimiter(startNode, startNodeOffset);
NS_WARNING_ASSERTION(NS_SUCCEEDED(rv), "Failed to collapse selection");
return rv;
}

8
layout/generic/nsFrameSelection.cpp
Просмотреть файл

@ -789,7 +789,7 @@ nsresult nsFrameSelection::MoveCaret(nsDirection aDirection,
node = anchorFocusRange->GetEndContainer();
offset = anchorFocusRange->EndOffset();
}
sel->Collapse(node, offset);
sel->CollapseInLimiter(node, offset);
}
sel->ScrollIntoView(nsISelectionController::SELECTION_FOCUS_REGION,
ScrollAxis(), ScrollAxis(), scrollFlags);
@ -873,7 +873,7 @@ nsresult nsFrameSelection::MoveCaret(nsDirection aDirection,
// 1. bumped into the BRFrame, bug 207623
// 2. had select-all in a text input (DIV range), bug 352759.
bool isBRFrame = frame->IsBrFrame();
sel->Collapse(sel->GetFocusNode(), sel->FocusOffset());
sel->CollapseInLimiter(sel->GetFocusNode(), sel->FocusOffset());
// Note: 'frame' might be dead here.
if (!isBRFrame) {
mCaret.mHint = CARET_ASSOCIATE_BEFORE; // We're now at the end of the
@ -1419,7 +1419,7 @@ nsresult nsFrameSelection::TakeFocus(nsIContent* const aNewFocus,
bool oldDesiredPosSet =
mDesiredCaretPos.mIsSet; // need to keep old desired
// position if it was set.
mDomSelections[index]->Collapse(aNewFocus, aContentOffset);
mDomSelections[index]->CollapseInLimiter(aNewFocus, aContentOffset);
mDesiredCaretPos.mIsSet =
oldDesiredPosSet; // now reset desired pos back.
mBatching = saveBatching;
@ -2574,7 +2574,7 @@ nsresult nsFrameSelection::TableSelection::HandleMouseUpOrDown(
// Even better, should we collapse to just after the LAST deepest
// child
// (i.e., at the end of the cell's contents)?
return aNormalSelection.Collapse(aChildContent, 0);
return aNormalSelection.CollapseInLimiter(aChildContent, 0);
}
#ifdef DEBUG_TABLE_SELECTION
printf(