Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-04 21:18:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1649121: part 33) Rename FindTargetNode to FindTargetNodeOfContextForPastedHTML. r=masayuki

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D82895
This commit is contained in:
Mirko Brodesser 2020-07-10 12:02:54 +00:00
parent ad6e91b777
commit b85c0263f1
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/libeditor/HTMLEditorDataTransfer.cpp
View File

@ -235,7 +235,8 @@ class MOZ_STACK_CLASS HTMLEditor::HTMLWithContextInserter final {
const EditorRawDOMPoint& aStartPoint, const EditorRawDOMPoint& aEndPoint,
nsTArray<OwningNonNull<nsIContent>>& aOutArrayOfContents);
static bool FindTargetNode(nsINode& aStart, nsCOMPtr<nsINode>& aResult);
static bool FindTargetNodeOfContextForPastedHTML(nsINode& aStart,
nsCOMPtr<nsINode>& aResult);
/**
* @return nullptr, if there's no invisible `<br>`.
@ -3063,7 +3064,7 @@ void HTMLEditor::HTMLWithContextInserter::
* the magical comment node containing kInsertCookie or, failing that, the
* firstChild of the firstChild (until we reach a leaf).
*/
bool HTMLEditor::HTMLWithContextInserter::FindTargetNode(
bool HTMLEditor::HTMLWithContextInserter::FindTargetNodeOfContextForPastedHTML(
nsINode& aStart, nsCOMPtr<nsINode>& aResult) {
nsIContent* firstChild = aStart.GetFirstChild();
if (!firstChild) {
@ -3093,7 +3094,7 @@ bool HTMLEditor::HTMLWithContextInserter::FindTargetNode(
}
}
if (FindTargetNode(*child, aResult)) {
if (FindTargetNodeOfContextForPastedHTML(*child, aResult)) {
return true;
}
}
@ -3154,8 +3155,8 @@ nsresult HTMLEditor::HTMLWithContextInserter::CreateDOMFragmentFromPaste(
HTMLWithContextInserter::RemoveHeadChildAndStealBodyChildsChildren(
*documentFragmentForContext);
HTMLWithContextInserter::FindTargetNode(*documentFragmentForContext,
targetNode);
HTMLWithContextInserter::FindTargetNodeOfContextForPastedHTML(
*documentFragmentForContext, targetNode);
}
nsCOMPtr<nsIContent> targetContent = nsIContent::FromNodeOrNull(targetNode);