Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1649980 - part 11: Make WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP() static r=m_kato

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D82704
This commit is contained in:
Masayuki Nakano 2020-07-13 15:30:51 +00:00
parent 27a7724def
commit 89d1495bf1
2 changed files with 35 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
editor/libeditor/WSRunObject.cpp
View File

@ -225,8 +225,9 @@ already_AddRefed<Element> WSRunObject::InsertBreak(
// We are at start of non-nbsps. Convert to a single nbsp.
EditorDOMPointInText endOfCollapsibleASCIIWhiteSpaces =
GetEndOfCollapsibleASCIIWhiteSpaces(atNextCharOfInsertionPoint);
nsresult rv = ReplaceASCIIWhiteSpacesWithOneNBSP(
atNextCharOfInsertionPoint, endOfCollapsibleASCIIWhiteSpaces);
nsresult rv = WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP(
MOZ_KnownLive(mHTMLEditor), atNextCharOfInsertionPoint,
endOfCollapsibleASCIIWhiteSpaces);
if (NS_FAILED(rv)) {
NS_WARNING(
"WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP() failed");
@ -1367,8 +1368,9 @@ nsresult WSRunObject::PrepareToDeleteRangePriv(WSRunObject* aEndObject) {
}
EditorDOMPointInText endOfCollapsibleASCIIWhiteSpaces =
GetEndOfCollapsibleASCIIWhiteSpaces(nextCharOfStartOfEnd);
nsresult rv = aEndObject->ReplaceASCIIWhiteSpacesWithOneNBSP(
nextCharOfStartOfEnd, endOfCollapsibleASCIIWhiteSpaces);
nsresult rv = WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP(
MOZ_KnownLive(mHTMLEditor), nextCharOfStartOfEnd,
endOfCollapsibleASCIIWhiteSpaces);
if (NS_FAILED(rv)) {
NS_WARNING(
"WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP() failed");
@ -1427,8 +1429,9 @@ nsresult WSRunObject::PrepareToDeleteRangePriv(WSRunObject* aEndObject) {
}
EditorDOMPointInText endOfCollapsibleASCIIWhiteSpaces =
GetEndOfCollapsibleASCIIWhiteSpaces(atPreviousCharOfStart);
nsresult rv = ReplaceASCIIWhiteSpacesWithOneNBSP(
atPreviousCharOfStart, endOfCollapsibleASCIIWhiteSpaces);
nsresult rv = WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP(
MOZ_KnownLive(mHTMLEditor), atPreviousCharOfStart,
endOfCollapsibleASCIIWhiteSpaces);
if (NS_FAILED(rv)) {
NS_WARNING(
"WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP() failed");
@ -1476,8 +1479,9 @@ nsresult WSRunObject::PrepareToSplitAcrossBlocksPriv() {
}
EditorDOMPointInText endOfCollapsibleASCIIWhiteSpaces =
GetEndOfCollapsibleASCIIWhiteSpaces(atNextCharOfStart);
nsresult rv = ReplaceASCIIWhiteSpacesWithOneNBSP(
atNextCharOfStart, endOfCollapsibleASCIIWhiteSpaces);
nsresult rv = WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP(
MOZ_KnownLive(mHTMLEditor), atNextCharOfStart,
endOfCollapsibleASCIIWhiteSpaces);
if (NS_FAILED(rv)) {
NS_WARNING("WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP() failed");
return rv;
@ -1502,8 +1506,9 @@ nsresult WSRunObject::PrepareToSplitAcrossBlocksPriv() {
}
EditorDOMPointInText endOfCollapsibleASCIIWhiteSpaces =
GetEndOfCollapsibleASCIIWhiteSpaces(atPreviousCharOfStart);
nsresult rv = ReplaceASCIIWhiteSpacesWithOneNBSP(
atPreviousCharOfStart, endOfCollapsibleASCIIWhiteSpaces);
nsresult rv = WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP(
MOZ_KnownLive(mHTMLEditor), atPreviousCharOfStart,
endOfCollapsibleASCIIWhiteSpaces);
if (NS_FAILED(rv)) {
NS_WARNING("WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP() failed");
return rv;
@ -1797,7 +1802,9 @@ WSRunScanner::TextFragmentData::GetFirstASCIIWhiteSpacePointCollapsedTo(
}
}
// static
nsresult WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP(
HTMLEditor& aHTMLEditor,
const EditorDOMPointInText& aAtFirstASCIIWhiteSpace,
const EditorDOMPointInText& aEndOfCollapsibleASCIIWhiteSpaces) {
MOZ_ASSERT(aAtFirstASCIIWhiteSpace.IsSetAndValid());
@ -1807,19 +1814,17 @@ nsresult WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP(
MOZ_ASSERT(aEndOfCollapsibleASCIIWhiteSpaces.IsEndOfContainer() ||
!aEndOfCollapsibleASCIIWhiteSpaces.IsCharASCIISpace());
AutoTransactionsConserveSelection dontChangeMySelection(mHTMLEditor);
nsresult rv =
MOZ_KnownLive(mHTMLEditor)
.ReplaceTextWithTransaction(
MOZ_KnownLive(*aAtFirstASCIIWhiteSpace.ContainerAsText()),
aAtFirstASCIIWhiteSpace.Offset(),
aAtFirstASCIIWhiteSpace.ContainerAsText() ==
aEndOfCollapsibleASCIIWhiteSpaces.ContainerAsText()
? aEndOfCollapsibleASCIIWhiteSpaces.Offset() -
aAtFirstASCIIWhiteSpace.Offset()
: aAtFirstASCIIWhiteSpace.ContainerAsText()->TextLength() -
aAtFirstASCIIWhiteSpace.Offset(),
nsDependentSubstring(&kNBSP, 1));
AutoTransactionsConserveSelection dontChangeMySelection(aHTMLEditor);
nsresult rv = aHTMLEditor.ReplaceTextWithTransaction(
MOZ_KnownLive(*aAtFirstASCIIWhiteSpace.ContainerAsText()),
aAtFirstASCIIWhiteSpace.Offset(),
aAtFirstASCIIWhiteSpace.ContainerAsText() ==
aEndOfCollapsibleASCIIWhiteSpaces.ContainerAsText()
? aEndOfCollapsibleASCIIWhiteSpaces.Offset() -
aAtFirstASCIIWhiteSpace.Offset()
: aAtFirstASCIIWhiteSpace.ContainerAsText()->TextLength() -
aAtFirstASCIIWhiteSpace.Offset(),
nsDependentSubstring(&kNBSP, 1));
if (NS_FAILED(rv)) {
NS_WARNING("HTMLEditor::ReplaceTextWithTransaction() failed");
return rv;
@ -1832,11 +1837,9 @@ nsresult WSRunObject::ReplaceASCIIWhiteSpacesWithOneNBSP(
// We need to remove the following unnecessary ASCII white-spaces because we
// collapsed them into the start node.
rv = MOZ_KnownLive(mHTMLEditor)
.DeleteTextAndTextNodesWithTransaction(
EditorDOMPointInText::AtEndOf(
*aAtFirstASCIIWhiteSpace.ContainerAsText()),
aEndOfCollapsibleASCIIWhiteSpaces);
rv = aHTMLEditor.DeleteTextAndTextNodesWithTransaction(
EditorDOMPointInText::AtEndOf(*aAtFirstASCIIWhiteSpace.ContainerAsText()),
aEndOfCollapsibleASCIIWhiteSpaces);
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rv),
"HTMLEditor::DeleteTextAndTextNodesWithTransaction() failed");

6
editor/libeditor/WSRunObject.h
View File

@ -1230,11 +1230,13 @@ class MOZ_STACK_CLASS WSRunObject final : public WSRunScanner {
* white-spaces.
*
* @param aAtFirstASCIIWhiteSpace First ASCII white-space
* position.
* position.
* @param aEndOfCollapsibleASCIIWhiteSpaces The position after last ASCII
* white-space.
*/
[[nodiscard]] MOZ_CAN_RUN_SCRIPT nsresult ReplaceASCIIWhiteSpacesWithOneNBSP(
[[nodiscard]] MOZ_CAN_RUN_SCRIPT static nsresult
ReplaceASCIIWhiteSpacesWithOneNBSP(
HTMLEditor& aHTMLEditor,
const EditorDOMPointInText& aAtFirstASCIIWhiteSpace,
const EditorDOMPointInText& aEndOfCollapsibleASCIIWhiteSpaces);