nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1793381 - part 3: Drop DeleteSelectedContent argument from HTMLEditor::InsertFromTransferable r=m_kato

Browse source 
It's always called with `DeleteSelectedContent::Yes`.  Therefore, the argument
is not required.  Then, its name can be `InsertFromTransferableAtSelection`.

Differential Revision: https://phabricator.services.mozilla.com/D158483
This commit is contained in:
Masayuki Nakano 2022-10-09 01:27:35 +00:00
parent df28abd410
commit 52fa7d578c
2 changed files with 25 additions and 29 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

5
editor/libeditor/HTMLEditor.h
View file

@ -3806,10 +3806,9 @@ class HTMLEditor final : public EditorBase,
nsresult PrepareHTMLTransferable(nsITransferable** aTransferable) const; nsresult PrepareHTMLTransferable(nsITransferable** aTransferable) const;
enum class HavePrivateHTMLFlavor { No, Yes }; enum class HavePrivateHTMLFlavor { No, Yes };
MOZ_CAN_RUN_SCRIPT nsresult InsertFromTransferable( MOZ_CAN_RUN_SCRIPT nsresult InsertFromTransferableAtSelection(
nsITransferable* aTransferable, const nsAString& aContextStr, nsITransferable* aTransferable, const nsAString& aContextStr,
const nsAString& aInfoStr, HavePrivateHTMLFlavor aHavePrivateHTMLFlavor, const nsAString& aInfoStr, HavePrivateHTMLFlavor aHavePrivateHTMLFlavor);
DeleteSelectedContent aDeleteSelectedContent);
/** /**
* InsertFromDataTransfer() is called only when user drops data into * InsertFromDataTransfer() is called only when user drops data into

49
editor/libeditor/HTMLEditorDataTransfer.cpp
View file

@ -1368,7 +1368,7 @@ nsresult HTMLEditor::HTMLTransferablePreparer::Run() {
NS_WARNING_ASSERTION(NS_SUCCEEDED(rvIgnored), NS_WARNING_ASSERTION(NS_SUCCEEDED(rvIgnored),
"nsITransferable::Init() failed, but ignored"); "nsITransferable::Init() failed, but ignored");
// See `HTMLEditor::InsertFromTransferable`. // See `HTMLEditor::InsertFromTransferableAtSelection`.
AddDataFlavorsInBestOrder(*transferable); AddDataFlavorsInBestOrder(*transferable);
transferable.forget(mTransferable); transferable.forget(mTransferable);
@ -1960,10 +1960,9 @@ static bool GetCString(nsISupports* aData, nsACString& aText) {
return false; return false;
} }
nsresult HTMLEditor::InsertFromTransferable( nsresult HTMLEditor::InsertFromTransferableAtSelection(
nsITransferable* aTransferable, const nsAString& aContextStr, nsITransferable* aTransferable, const nsAString& aContextStr,
const nsAString& aInfoStr, HavePrivateHTMLFlavor aHavePrivateHTMLFlavor, const nsAString& aInfoStr, HavePrivateHTMLFlavor aHavePrivateHTMLFlavor) {
DeleteSelectedContent aDeleteSelectedContent) {
nsAutoCString bestFlavor; nsAutoCString bestFlavor;
nsCOMPtr<nsISupports> genericDataObj; nsCOMPtr<nsISupports> genericDataObj;
@ -1985,7 +1984,7 @@ nsresult HTMLEditor::InsertFromTransferable(
bestFlavor.EqualsLiteral(kPNGImageMime) || bestFlavor.EqualsLiteral(kPNGImageMime) ||
bestFlavor.EqualsLiteral(kGIFImageMime)) { bestFlavor.EqualsLiteral(kGIFImageMime)) {
nsresult rv = InsertObject(bestFlavor, genericDataObj, safeToInsertData, nsresult rv = InsertObject(bestFlavor, genericDataObj, safeToInsertData,
EditorDOMPoint(), aDeleteSelectedContent); EditorDOMPoint(), DeleteSelectedContent::Yes);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
NS_WARNING("HTMLEditor::InsertObject() failed"); NS_WARNING("HTMLEditor::InsertObject() failed");
return rv; return rv;
@ -2006,11 +2005,12 @@ nsresult HTMLEditor::InsertFromTransferable(
*this, ScrollSelectionIntoView::Yes, __FUNCTION__); *this, ScrollSelectionIntoView::Yes, __FUNCTION__);
rv = InsertHTMLWithContextAsSubAction( rv = InsertHTMLWithContextAsSubAction(
cffragment, aContextStr, aInfoStr, flavor, safeToInsertData, cffragment, aContextStr, aInfoStr, flavor, safeToInsertData,
EditorDOMPoint(), aDeleteSelectedContent, EditorDOMPoint(), DeleteSelectedContent::Yes,
InlineStylesAtInsertionPoint::Clear); InlineStylesAtInsertionPoint::Clear);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
NS_WARNING( NS_WARNING(
"HTMLEditor::InsertHTMLWithContextAsSubAction(" "HTMLEditor::InsertHTMLWithContextAsSubAction("
"DeleteSelectedContent::Yes, "
"InlineStylesAtInsertionPoint::Clear) failed"); "InlineStylesAtInsertionPoint::Clear) failed");
return rv; return rv;
} }
@ -2019,11 +2019,12 @@ nsresult HTMLEditor::InsertFromTransferable(
*this, ScrollSelectionIntoView::Yes, __FUNCTION__); *this, ScrollSelectionIntoView::Yes, __FUNCTION__);
rv = InsertHTMLWithContextAsSubAction( rv = InsertHTMLWithContextAsSubAction(
cffragment, cfcontext, cfselection, flavor, safeToInsertData, cffragment, cfcontext, cfselection, flavor, safeToInsertData,
EditorDOMPoint(), aDeleteSelectedContent, EditorDOMPoint(), DeleteSelectedContent::Yes,
InlineStylesAtInsertionPoint::Clear); InlineStylesAtInsertionPoint::Clear);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
NS_WARNING( NS_WARNING(
"HTMLEditor::InsertHTMLWithContextAsSubAction(" "HTMLEditor::InsertHTMLWithContextAsSubAction("
"DeleteSelectedContent::Yes, "
"InlineStylesAtInsertionPoint::Clear) failed"); "InlineStylesAtInsertionPoint::Clear) failed");
return rv; return rv;
} }
@ -2056,11 +2057,12 @@ nsresult HTMLEditor::InsertFromTransferable(
*this, ScrollSelectionIntoView::Yes, __FUNCTION__); *this, ScrollSelectionIntoView::Yes, __FUNCTION__);
nsresult rv = InsertHTMLWithContextAsSubAction( nsresult rv = InsertHTMLWithContextAsSubAction(
stuffToPaste, aContextStr, aInfoStr, flavor, safeToInsertData, stuffToPaste, aContextStr, aInfoStr, flavor, safeToInsertData,
EditorDOMPoint(), aDeleteSelectedContent, EditorDOMPoint(), DeleteSelectedContent::Yes,
InlineStylesAtInsertionPoint::Clear); InlineStylesAtInsertionPoint::Clear);
if (NS_FAILED(rv)) { if (NS_FAILED(rv)) {
NS_WARNING( NS_WARNING(
"HTMLEditor::InsertHTMLWithContextAsSubAction(" "HTMLEditor::InsertHTMLWithContextAsSubAction("
"DeleteSelectedContent::Yes, "
"InlineStylesAtInsertionPoint::Clear) failed"); "InlineStylesAtInsertionPoint::Clear) failed");
return rv; return rv;
} }
@ -2396,12 +2398,11 @@ nsresult HTMLEditor::PasteInternal(int32_t aClipboardType) {
} }
} }
rv = InsertFromTransferable(transferable, contextStr, infoStr, rv = InsertFromTransferableAtSelection(transferable, contextStr, infoStr,
clipboardHasPrivateHTMLFlavor, clipboardHasPrivateHTMLFlavor);
DeleteSelectedContent::Yes);
NS_WARNING_ASSERTION( NS_WARNING_ASSERTION(
NS_SUCCEEDED(rv), NS_SUCCEEDED(rv),
"HTMLEditor::InsertFromTransferable(DeleteSelectedContent::Yes) failed"); "HTMLEditor::InsertFromTransferableAtSelection() failed");
return rv; return rv;
} }
@ -2444,13 +2445,11 @@ nsresult HTMLEditor::PasteTransferableAsAction(nsITransferable* aTransferable,
"DeleteSelectedContent::Yes) failed"); "DeleteSelectedContent::Yes) failed");
} else { } else {
nsAutoString contextStr, infoStr; nsAutoString contextStr, infoStr;
rv = InsertFromTransferable(aTransferable, contextStr, infoStr, rv = InsertFromTransferableAtSelection(aTransferable, contextStr, infoStr,
HavePrivateHTMLFlavor::No, HavePrivateHTMLFlavor::No);
DeleteSelectedContent::Yes); NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
NS_WARNING_ASSERTION( "HTMLEditor::InsertFromTransferableAtSelection("
NS_SUCCEEDED(rv), "HavePrivateHTMLFlavor::No) failed");
"HTMLEditor::InsertFromTransferable(HavePrivateHTMLFlavor::No, "
"DeleteSelectedContent::Yes) failed");
} }
return EditorBase::ToGenericNSResult(rv); return EditorBase::ToGenericNSResult(rv);
} }
@ -2524,13 +2523,11 @@ nsresult HTMLEditor::PasteNoFormattingAsAction(int32_t aSelectionType,
return rv; return rv;
} }
rv = InsertFromTransferable(transferable, u""_ns, u""_ns, rv = InsertFromTransferableAtSelection(transferable, u""_ns, u""_ns,
HavePrivateHTMLFlavor::No, HavePrivateHTMLFlavor::No);
DeleteSelectedContent::Yes); NS_WARNING_ASSERTION(NS_SUCCEEDED(rv),
NS_WARNING_ASSERTION( "HTMLEditor::InsertFromTransferableAtSelection("
NS_SUCCEEDED(rv), "HavePrivateHTMLFlavor::No) failed");
"HTMLEditor::InsertFromTransferable(HavePrivateHTMLFlavor::No, "
"DeleteSelectedContent::Yes) failed");
return EditorBase::ToGenericNSResult(rv); return EditorBase::ToGenericNSResult(rv);
} }