Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1468708 - Part 3. Clean up local functions not to calculate atom again. r=masayuki

Browse Source 
nsComposerCommands has unnecessary atom calculation, so we should remove it.
Also, since nsStyleUpdatingCommand doesn't hava "all" tag names, we don't need
to support it.

MozReview-Commit-ID: Q0EBsK2mxr

--HG--
extra : rebase_source : eecf3314f416e0f77cc364eefc008deb81933ddf
This commit is contained in:
Makoto Kato 2018-06-15 08:56:25 -07:00
parent e4a357f9ab
commit 7b8d3f391a
1 changed files with 33 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
editor/composer/nsComposerCommands.cpp
View File

@ -34,16 +34,10 @@ using mozilla::dom::Element;
using mozilla::ErrorResult;
//prototype
nsresult GetListState(mozilla::HTMLEditor* aHTMLEditor,
bool* aMixed,
nsAString& aLocalName);
nsresult RemoveOneProperty(mozilla::HTMLEditor* aHTMLEditor,
const nsAString& aProp);
nsresult RemoveTextProperty(mozilla::HTMLEditor* aHTMLEditor,
const nsAString& aProp);
nsresult SetTextProperty(mozilla::HTMLEditor* aHTMLEditor,
const nsAString& aProp);
static nsresult
GetListState(mozilla::HTMLEditor* aHTMLEditor,
bool* aMixed,
nsAString& aLocalName);
//defines
#define STATE_ENABLED "state_enabled"
@ -253,31 +247,41 @@ nsStyleUpdatingCommand::ToggleState(mozilla::HTMLEditor* aHTMLEditor)
if (doTagRemoval) {
// Also remove equivalent properties (bug 317093)
if (mTagName == nsGkAtoms::b) {
rv = RemoveTextProperty(aHTMLEditor, NS_LITERAL_STRING("strong"));
NS_ENSURE_SUCCESS(rv, rv);
rv = aHTMLEditor->RemoveInlineProperty(nsGkAtoms::strong, nullptr);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
} else if (mTagName == nsGkAtoms::i) {
rv = RemoveTextProperty(aHTMLEditor, NS_LITERAL_STRING("em"));
NS_ENSURE_SUCCESS(rv, rv);
rv = aHTMLEditor->RemoveInlineProperty(nsGkAtoms::em, nullptr);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
} else if (mTagName == nsGkAtoms::strike) {
rv = RemoveTextProperty(aHTMLEditor, NS_LITERAL_STRING("s"));
NS_ENSURE_SUCCESS(rv, rv);
rv = aHTMLEditor->RemoveInlineProperty(nsGkAtoms::s, nullptr);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
}
rv = RemoveTextProperty(aHTMLEditor, nsDependentAtomString(mTagName));
} else {
// Superscript and Subscript styles are mutually exclusive
aHTMLEditor->BeginTransaction();
nsDependentAtomString tagName(mTagName);
if (mTagName == nsGkAtoms::sub || mTagName == nsGkAtoms::sup) {
rv = RemoveTextProperty(aHTMLEditor, tagName);
rv = aHTMLEditor->RemoveInlineProperty(mTagName, nullptr);
if (NS_WARN_IF(NS_FAILED(rv))) {
return rv;
}
if (NS_SUCCEEDED(rv))
rv = SetTextProperty(aHTMLEditor, tagName);
aHTMLEditor->EndTransaction();
return rv;
}
// Superscript and Subscript styles are mutually exclusive
aHTMLEditor->BeginTransaction();
if (mTagName == nsGkAtoms::sub || mTagName == nsGkAtoms::sup) {
rv = aHTMLEditor->RemoveInlineProperty(mTagName, nullptr);
}
if (NS_SUCCEEDED(rv)) {
rv = aHTMLEditor->SetInlineProperty(mTagName, nullptr, EmptyString());
}
aHTMLEditor->EndTransaction();
return rv;
}
@ -1541,7 +1545,7 @@ nsInsertTagCommand::GetCommandStateParams(const char *aCommandName,
//HELPER METHODS
/****************************/
nsresult
static nsresult
GetListState(mozilla::HTMLEditor* aHTMLEditor,
bool* aMixed,
nsAString& aLocalName)
@ -1569,47 +1573,3 @@ GetListState(mozilla::HTMLEditor* aHTMLEditor,
}
return NS_OK;
}
nsresult
RemoveOneProperty(mozilla::HTMLEditor* aHTMLEditor,
const nsAString& aProp)
{
MOZ_ASSERT(aHTMLEditor);
/// XXX Hack alert! Look in nsIEditProperty.h for this
RefPtr<nsAtom> styleAtom = NS_Atomize(aProp);
NS_ENSURE_TRUE(styleAtom, NS_ERROR_OUT_OF_MEMORY);
return aHTMLEditor->RemoveInlineProperty(styleAtom, nullptr);
}
// the name of the attribute here should be the contents of the appropriate
// tag, e.g. 'b' for bold, 'i' for italics.
nsresult
RemoveTextProperty(mozilla::HTMLEditor* aHTMLEditor,
const nsAString& aProp)
{
MOZ_ASSERT(aHTMLEditor);
if (aProp.LowerCaseEqualsLiteral("all")) {
return aHTMLEditor->RemoveAllInlineProperties();
}
return RemoveOneProperty(aHTMLEditor, aProp);
}
// the name of the attribute here should be the contents of the appropriate
// tag, e.g. 'b' for bold, 'i' for italics.
nsresult
SetTextProperty(mozilla::HTMLEditor* aHTMLEditor,
const nsAString& aProp)
{
MOZ_ASSERT(aHTMLEditor);
/// XXX Hack alert! Look in nsIEditProperty.h for this
RefPtr<nsAtom> styleAtom = NS_Atomize(aProp);
NS_ENSURE_TRUE(styleAtom, NS_ERROR_OUT_OF_MEMORY);
return aHTMLEditor->SetInlineProperty(styleAtom, nullptr, EmptyString());
}