| Index: Source/core/editing/EditingStyle.cpp
|
| diff --git a/Source/core/editing/EditingStyle.cpp b/Source/core/editing/EditingStyle.cpp
|
| index 5c45b7a9aebca45930aa9adf4c5f530e4a59c1b9..03bedd5da57aa78ac06a2e134130d1a26b961e6b 100644
|
| --- a/Source/core/editing/EditingStyle.cpp
|
| +++ b/Source/core/editing/EditingStyle.cpp
|
| @@ -1067,7 +1067,7 @@ PassRefPtrWillBeRawPtr<EditingStyle> EditingStyle::wrappingStyleForSerialization
|
| // Styles that Mail blockquotes contribute should only be placed on the Mail blockquote,
|
| // to help us differentiate those styles from ones that the user has applied.
|
| // This helps us get the color of content pasted into blockquotes right.
|
| - wrappingStyle->removeStyleAddedByNode(enclosingNodeOfType(firstPositionInOrBeforeNode(context), isMailBlockquote, CanCrossEditingBoundary));
|
| + wrappingStyle->removeStyleAddedByNode(enclosingNodeOfType(firstPositionInOrBeforeNode(context), isMailHTMLBlockquoteElement, CanCrossEditingBoundary));
|
|
|
| // Call collapseTextDecorationProperties first or otherwise it'll copy the value over from in-effect to text-decorations.
|
| wrappingStyle->collapseTextDecorationProperties();
|
| @@ -1079,7 +1079,7 @@ PassRefPtrWillBeRawPtr<EditingStyle> EditingStyle::wrappingStyleForSerialization
|
|
|
| // When not annotating for interchange, we only preserve inline style declarations.
|
| for (Node* node = context; node && !node->isDocumentNode(); node = node->parentNode()) {
|
| - if (node->isStyledElement() && !isMailBlockquote(node)) {
|
| + if (node->isStyledElement() && !isMailHTMLBlockquoteElement(node)) {
|
| wrappingStyle->mergeInlineAndImplicitStyleOfElement(toElement(node), EditingStyle::DoNotOverrideValues,
|
| EditingStyle::EditingPropertiesInEffect);
|
| }
|
|
|