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

Bug 1725291 - part 3: Make WhiteSpaceVisibilityKeeper::MergeFirstLineOf(Right|Left)BlockElementIntoDescendant(Left|Right)BlockElement() abort handling it if joining elements become non-editable r=m_kato

Browse Source 
They clean up the tail of descendant block first.  At this time, running script
may change one of or both of the left block element and the right block element.
In such situation, they should stop handling to join the blocks because of
unexpected case.

Depends on D122562

Differential Revision: https://phabricator.services.mozilla.com/D122565
This commit is contained in:
Masayuki Nakano 2021-08-17 00:45:45 +00:00
parent 6b226a31b2
commit 13e75af6ad
2 changed files with 72 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
editor/libeditor/WSRunObject.cpp
View File

@ -114,8 +114,6 @@ EditActionResult WhiteSpaceVisibilityKeeper::
AutoTransactionsConserveSelection dontChangeMySelection(aHTMLEditor);
EditorDOMPoint afterRightBlockChild = aAtRightBlockChild.NextPoint();
MOZ_ASSERT(afterRightBlockChild.IsSetAndValid());
nsresult rv = WhiteSpaceVisibilityKeeper::DeleteInvisibleASCIIWhiteSpaces(
aHTMLEditor, EditorDOMPoint::AtEndOf(aLeftBlockElement));
if (NS_FAILED(rv)) {
@ -124,14 +122,44 @@ EditActionResult WhiteSpaceVisibilityKeeper::
"failed at left block");
return EditActionResult(rv);
}
if (!afterRightBlockChild.IsSetAndValid()) {
NS_WARNING(
"WhiteSpaceVisibilityKeeper::DeleteInvisibleASCIIWhiteSpaces() caused "
"running script and the point to be modified was changed");
return EditActionResult(NS_ERROR_EDITOR_UNEXPECTED_DOM_TREE);
// Check whether aLeftBlockElement is a descendant of aRightBlockElement.
if (aHTMLEditor.MayHaveMutationEventListeners()) {
EditorDOMPoint leftBlockContainingPointInRightBlockElement;
if (aHTMLEditor.MayHaveMutationEventListeners() &&
!EditorUtils::IsDescendantOf(
aLeftBlockElement, aRightBlockElement,
&leftBlockContainingPointInRightBlockElement)) {
NS_WARNING(
"Deleting invisible whitespace at end of left block element caused "
"moving the left block element outside the right block element");
return EditActionResult(NS_ERROR_EDITOR_UNEXPECTED_DOM_TREE);
}
if (leftBlockContainingPointInRightBlockElement != aAtRightBlockChild) {
NS_WARNING(
"Deleting invisible whitespace at end of left block element caused "
"changing the left block element in the right block element");
return EditActionResult(NS_ERROR_EDITOR_UNEXPECTED_DOM_TREE);
}
if (!EditorUtils::IsEditableContent(aRightBlockElement, EditorType::HTML)) {
NS_WARNING(
"Deleting invisible whitespace at end of left block element caused "
"making the right block element non-editable");
return EditActionResult(NS_ERROR_EDITOR_UNEXPECTED_DOM_TREE);
}
if (!EditorUtils::IsEditableContent(aLeftBlockElement, EditorType::HTML)) {
NS_WARNING(
"Deleting invisible whitespace at end of left block element caused "
"making the left block element non-editable");
return EditActionResult(NS_ERROR_EDITOR_UNEXPECTED_DOM_TREE);
}
}
OwningNonNull<Element> rightBlockElement = aRightBlockElement;
EditorDOMPoint afterRightBlockChild = aAtRightBlockChild.NextPoint();
{
// We can't just track rightBlockElement because it's an Element.
AutoTrackDOMPoint tracker(aHTMLEditor.RangeUpdaterRef(),
@ -273,11 +301,42 @@ EditActionResult WhiteSpaceVisibilityKeeper::
"at right block");
return EditActionResult(rv);
}
if (!aAtLeftBlockChild.IsSetAndValid()) {
NS_WARNING(
"WhiteSpaceVisibilityKeeper::DeleteInvisibleASCIIWhiteSpaces() caused "
"running script and the point to be modified was changed");
return EditActionResult(NS_ERROR_EDITOR_UNEXPECTED_DOM_TREE);
// Check whether aRightBlockElement is a descendant of aLeftBlockElement.
if (aHTMLEditor.MayHaveMutationEventListeners()) {
EditorDOMPoint rightBlockContainingPointInLeftBlockElement;
if (aHTMLEditor.MayHaveMutationEventListeners() &&
!EditorUtils::IsDescendantOf(
aRightBlockElement, aLeftBlockElement,
&rightBlockContainingPointInLeftBlockElement)) {
NS_WARNING(
"Deleting invisible whitespace at start of right block element "
"caused moving the right block element outside the left block "
"element");
return EditActionResult(NS_ERROR_EDITOR_UNEXPECTED_DOM_TREE);
}
if (rightBlockContainingPointInLeftBlockElement != aAtLeftBlockChild) {
NS_WARNING(
"Deleting invisible whitespace at start of right block element "
"caused changing the right block element position in the left block "
"element");
return EditActionResult(NS_ERROR_EDITOR_UNEXPECTED_DOM_TREE);
}
if (!EditorUtils::IsEditableContent(aLeftBlockElement, EditorType::HTML)) {
NS_WARNING(
"Deleting invisible whitespace at start of right block element "
"caused making the left block element non-editable");
return EditActionResult(NS_ERROR_EDITOR_UNEXPECTED_DOM_TREE);
}
if (!EditorUtils::IsEditableContent(aRightBlockElement, EditorType::HTML)) {
NS_WARNING(
"Deleting invisible whitespace at start of right block element "
"caused making the right block element non-editable");
return EditActionResult(NS_ERROR_EDITOR_UNEXPECTED_DOM_TREE);
}
}
OwningNonNull<Element> originalLeftBlockElement = aLeftBlockElement;

2
editor/libeditor/crashtests/crashtests.list
View File

@ -96,7 +96,7 @@ load 1402526.html
pref(dom.document.exec_command.nested_calls_allowed,true) asserts(1) load 1402904.html # assertion is that mutation event listener caused by execCommand calls another execCommand
pref(dom.document.exec_command.nested_calls_allowed,true) asserts(1) load 1405747.html # assertion is that mutation event listener caused by execCommand calls another execCommand
load 1405897.html
asserts(1) load 1408170.html # assertion in WSRunScanner::GetEditableBlockParentOrTopmostEditableInlineContent()
load 1408170.html
asserts(0-1) load 1414581.html
load 1415231.html
load 1423767.html