Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 08:12:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1649121: part 24) Move StripFormattingNodes. r=masayuki

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D82389
This commit is contained in:
Mirko Brodesser 2020-07-07 12:32:40 +00:00
parent db05434bca
commit df5c5a5851
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/libeditor/HTMLEditor.h
View File

@ -4382,9 +4382,6 @@ class HTMLEditor final : public TextEditor,
nsresult ParseCFHTML(nsCString& aCfhtml, char16_t** aStuffToPaste,
char16_t** aCfcontext);
static nsresult StripFormattingNodes(nsIContent& aNode,
bool aOnlyList = false);
/**
* CollectTopMostChildContentsCompletelyInRange() collects topmost child
* contents which are completely in the given range.

25
editor/libeditor/HTMLEditorDataTransfer.cpp
View File

@ -243,6 +243,9 @@ class MOZ_STACK_CLASS HTMLEditor::HTMLWithContextInserter final {
dom::DocumentFragment** aFragment,
bool aTrustedInput);
static nsresult StripFormattingNodes(nsIContent& aNode,
bool aOnlyList = false);
HTMLEditor& mHTMLEditor;
};
@ -886,7 +889,8 @@ Element* HTMLEditor::GetLinkElement(nsINode* aNode) {
}
// static
nsresult HTMLEditor::StripFormattingNodes(nsIContent& aNode, bool aListOnly) {
nsresult HTMLEditor::HTMLWithContextInserter::StripFormattingNodes(
nsIContent& aNode, bool aListOnly) {
if (aNode.TextIsOnlyWhitespace()) {
nsCOMPtr<nsINode> parent = aNode.GetParentNode();
if (parent) {
@ -904,9 +908,12 @@ nsresult HTMLEditor::StripFormattingNodes(nsIContent& aNode, bool aListOnly) {
nsCOMPtr<nsIContent> child = aNode.GetLastChild();
while (child) {
nsCOMPtr<nsIContent> previous = child->GetPreviousSibling();
nsresult rv = HTMLEditor::StripFormattingNodes(*child, aListOnly);
nsresult rv =
HTMLWithContextInserter::StripFormattingNodes(*child, aListOnly);
if (NS_FAILED(rv)) {
NS_WARNING("HTMLEditor::StripFormattingNodes() failed");
NS_WARNING(
"HTMLEditor::HTMLWithContextInserter::StripFormattingNodes() "
"failed");
return rv;
}
child = std::move(previous);
@ -3030,9 +3037,11 @@ nsresult HTMLEditor::HTMLWithContextInserter::CreateDOMFragmentFromPaste(
return NS_ERROR_FAILURE;
}
rv = HTMLEditor::StripFormattingNodes(*documentFragmentForContext);
rv = HTMLWithContextInserter::StripFormattingNodes(
*documentFragmentForContext);
if (NS_FAILED(rv)) {
NS_WARNING("HTMLEditor::StripFormattingNodes() failed");
NS_WARNING(
"HTMLEditor::HTMLWithContextInserter::StripFormattingNodes() failed");
return rv;
}
@ -3082,9 +3091,11 @@ nsresult HTMLEditor::HTMLWithContextInserter::CreateDOMFragmentFromPaste(
documentFragmentToInsert = documentFragmentForContext;
}
rv = HTMLEditor::StripFormattingNodes(*documentFragmentToInsert, true);
rv = HTMLWithContextInserter::StripFormattingNodes(*documentFragmentToInsert,
true);
if (NS_FAILED(rv)) {
NS_WARNING("HTMLEditor::StripFormattingNodes() failed");
NS_WARNING(
"HTMLEditor::HTMLWithContextInserter::StripFormattingNodes() failed");
return rv;
}