corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1660378 - part 3: Make CSSEditUtils::RemoveCSSEquivalentToHTMLStyle() take nsStyledElement& instead of Element* r=m_kato

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D87984
This commit is contained in:
Masayuki Nakano
2020-08-26 04:48:19 +00:00
parent cda4f82a28
commit f91231b39f
4 changed files with 81 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
editor/libeditor/HTMLStyleEditor.cpp
View File

@@ -1138,18 +1138,23 @@ nsresult HTMLEditor::RemoveStyleInside(Element& aElement, nsAtom* aProperty,
if (CSSEditUtils::IsCSSEditableProperty(&aElement, aProperty, aAttribute) &&
CSSEditUtils::HaveSpecifiedCSSEquivalentStyles(aElement, aProperty,
aAttribute)) {
// If aElement has CSS declaration of the given style, remove it.
nsresult rv = mCSSEditUtils->RemoveCSSEquivalentToHTMLStyle(
&aElement, aProperty, aAttribute, nullptr, false);
if (rv == NS_ERROR_EDITOR_DESTROYED) {
NS_WARNING(
"CSSEditUtils::RemoveCSSEquivalentToHTMLStyle() destroyed the "
"editor");
return NS_ERROR_EDITOR_DESTROYED;
if (nsCOMPtr<nsStyledElement> styledElement =
do_QueryInterface(&aElement)) {
// If aElement has CSS declaration of the given style, remove it.
nsresult rv =
mCSSEditUtils->RemoveCSSEquivalentToHTMLStyleWithTransaction(
*styledElement, aProperty, aAttribute, nullptr);
if (rv == NS_ERROR_EDITOR_DESTROYED) {
NS_WARNING(
"CSSEditUtils::RemoveCSSEquivalentToHTMLStyleWithTransaction() "
"destroyed the editor");
return NS_ERROR_EDITOR_DESTROYED;
}
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rv),
"CSSEditUtils::RemoveCSSEquivalentToHTMLStyleWithTransaction() "
"failed, but ignored");
}
NS_WARNING_ASSERTION(
NS_SUCCEEDED(rv),
"CSSEditUtils::RemoveCSSEquivalentToHTMLStyle() failed, but ignored");
// Additionally, remove aElement itself if it's a `<span>` or `<font>`
// and it does not have non-empty `style`, `id` nor `class` attribute.
if (aElement.IsAnyOfHTMLElements(nsGkAtoms::span, nsGkAtoms::font) &&