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

Bug 1574852 - part 31: Move HTMLEditRules::IsEmptyInline() and HTMLEditRules::ListIsEmptyLine() to HTMLEditor r=m_kato

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D43192

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Masayuki Nakano 2019-08-25 06:59:24 +00:00
parent bff247acdd
commit 1a76778801
2 changed files with 66 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
editor/libeditor/HTMLEditRules.cpp
View File

@ -4029,7 +4029,8 @@ nsresult HTMLEditRules::MakeList(nsAtom& aListType, bool aEntireList,
bool bOnlyBreaks = true;
for (auto& curNode : arrayOfNodes) {
// if curNode is not a Break or empty inline, we're done
if (!TextEditUtils::IsBreak(curNode) && !IsEmptyInline(curNode)) {
if (!TextEditUtils::IsBreak(curNode) &&
!HTMLEditorRef().IsEmptyInineNode(curNode)) {
bOnlyBreaks = false;
break;
}
@ -4159,7 +4160,8 @@ nsresult HTMLEditRules::MakeList(nsAtom& aListType, bool aEntireList,
// If an empty inline container, delete it, but still remember the previous
// item.
if (HTMLEditorRef().IsEditable(curNode) &&
(TextEditUtils::IsBreak(curNode) || IsEmptyInline(curNode))) {
(TextEditUtils::IsBreak(curNode) ||
HTMLEditorRef().IsEmptyInineNode(curNode))) {
nsresult rv =
MOZ_KnownLive(HTMLEditorRef()).DeleteNodeWithTransaction(*curNode);
if (NS_WARN_IF(!CanHandleEditAction())) {
@ -4576,8 +4578,10 @@ nsresult HTMLEditRules::MakeBasicBlock(nsAtom& blockType) {
return rv;
}
// If nothing visible in list, make an empty block
if (ListIsEmptyLine(arrayOfNodes)) {
// If there is no visible and editable nodes in the edit targets, make an
// empty block.
// XXX Isn't this odd if there are only non-editable visible nodes?
if (HTMLEditorRef().IsEmptyOneHardLine(arrayOfNodes)) {
nsRange* firstRange = SelectionRefPtr()->GetRangeAt(0);
if (NS_WARN_IF(!firstRange)) {
return NS_ERROR_FAILURE;
@ -4845,8 +4849,10 @@ nsresult HTMLEditRules::IndentAroundSelectionWithCSS() {
}
}
// if nothing visible in list, make an empty block
if (ListIsEmptyLine(arrayOfNodes)) {
// If there is no visible and editable nodes in the edit targets, make an
// empty block.
// XXX Isn't this odd if there are only non-editable visible nodes?
if (HTMLEditorRef().IsEmptyOneHardLine(arrayOfNodes)) {
// get selection location
nsRange* firstRange = SelectionRefPtr()->GetRangeAt(0);
if (NS_WARN_IF(!firstRange)) {
@ -5137,8 +5143,10 @@ nsresult HTMLEditRules::IndentAroundSelectionWithHTML() {
return rv;
}
// if nothing visible in list, make an empty block
if (ListIsEmptyLine(arrayOfNodes)) {
// If there is no visible and editable nodes in the edit targets, make an
// empty block.
// XXX Isn't this odd if there are only non-editable visible nodes?
if (HTMLEditorRef().IsEmptyOneHardLine(arrayOfNodes)) {
nsRange* firstRange = SelectionRefPtr()->GetRangeAt(0);
if (NS_WARN_IF(!firstRange)) {
return NS_ERROR_FAILURE;
@ -10023,49 +10031,6 @@ nsresult HTMLEditRules::SelectionEndpointInNode(nsINode* aNode, bool* aResult) {
return NS_OK;
}
bool HTMLEditRules::IsEmptyInline(nsINode& aNode) {
MOZ_ASSERT(IsEditorDataAvailable());
if (HTMLEditor::NodeIsInlineStatic(aNode) &&
HTMLEditorRef().IsContainer(&aNode)) {
bool isEmpty = true;
HTMLEditorRef().IsEmptyNode(&aNode, &isEmpty);
return isEmpty;
}
return false;
}
bool HTMLEditRules::ListIsEmptyLine(
nsTArray<OwningNonNull<nsINode>>& aArrayOfNodes) {
MOZ_ASSERT(IsEditorDataAvailable());
// We have a list of nodes which we are candidates for being moved into a
// new block. Determine if it's anything more than a blank line. Look for
// editable content above and beyond one single BR.
if (NS_WARN_IF(!aArrayOfNodes.Length())) {
return true;
}
int32_t brCount = 0;
for (auto& node : aArrayOfNodes) {
if (!HTMLEditorRef().IsEditable(node)) {
continue;
}
if (TextEditUtils::IsBreak(node)) {
// First break doesn't count
if (brCount) {
return false;
}
brCount++;
} else if (IsEmptyInline(node)) {
// Empty inline, keep looking
} else {
return false;
}
}
return true;
}
nsresult HTMLEditRules::PopListItem(nsIContent& aListItem, bool* aOutOfList) {
MOZ_ASSERT(IsEditorDataAvailable());
@ -10887,8 +10852,10 @@ nsresult HTMLEditRules::PrepareToMakeElementAbsolutePosition(
return rv;
}
// If nothing visible in list, make an empty block
if (ListIsEmptyLine(arrayOfNodes)) {
// If there is no visible and editable nodes in the edit targets, make an
// empty block.
// XXX Isn't this odd if there are only non-editable visible nodes?
if (HTMLEditorRef().IsEmptyOneHardLine(arrayOfNodes)) {
nsRange* firstRange = SelectionRefPtr()->GetRangeAt(0);
if (NS_WARN_IF(!firstRange)) {
return NS_ERROR_FAILURE;

46
editor/libeditor/HTMLEditor.h
View File

@ -1549,6 +1549,52 @@ class HTMLEditor final : public TextEditor,
MOZ_CAN_RUN_SCRIPT MOZ_MUST_USE nsresult
MaybeExtendSelectionToHardLineEdgesForBlockEditAction();
/**
* IsEmptyInline() returns true if aNode is an inline node and it does not
* have meaningful content.
*/
bool IsEmptyInineNode(nsINode& aNode) const {
MOZ_ASSERT(IsEditActionDataAvailable());
if (!HTMLEditor::NodeIsInlineStatic(aNode) || !IsContainer(&aNode)) {
return false;
}
bool isEmpty = true;
IsEmptyNode(&aNode, &isEmpty);
return isEmpty;
}
/**
* IsEmptyOneHardLine() returns true if aArrayOfNodes does not represent
* 2 or more lines and have meaningful content.
*/
bool IsEmptyOneHardLine(
nsTArray<OwningNonNull<nsINode>>& aArrayOfNodes) const {
if (NS_WARN_IF(!aArrayOfNodes.Length())) {
return true;
}
bool brElementHasFound = false;
for (auto& node : aArrayOfNodes) {
if (!IsEditable(node)) {
continue;
}
if (node->IsHTMLElement(nsGkAtoms::br)) {
// If there are 2 or more `<br>` elements, it's not empty line since
// there may be only one `<br>` element in a hard line.
if (brElementHasFound) {
return false;
}
brElementHasFound = true;
continue;
}
if (!IsEmptyInineNode(node)) {
return false;
}
}
return true;
}
protected: // Called by helper classes.
virtual void OnStartToHandleTopLevelEditSubAction(
EditSubAction aEditSubAction, nsIEditor::EDirection aDirection) override;