| Index: Source/WebCore/editing/EditingStyle.cpp
|
| diff --git a/Source/WebCore/editing/EditingStyle.cpp b/Source/WebCore/editing/EditingStyle.cpp
|
| index a30f800c5de3531deb6f053012aa57db61d7f117..167ed61c1d750d470f8326ea0286cda29eb0cbbd 100644
|
| --- a/Source/WebCore/editing/EditingStyle.cpp
|
| +++ b/Source/WebCore/editing/EditingStyle.cpp
|
| @@ -1007,11 +1007,6 @@ PassRefPtr<EditingStyle> EditingStyle::wrappingStyleForSerialization(Node* conte
|
| if (shouldAnnotate) {
|
| wrappingStyle = EditingStyle::create(context, EditingStyle::EditingPropertiesInEffect);
|
|
|
| - // 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));
|
| -
|
| // Call collapseTextDecorationProperties first or otherwise it'll copy the value over from in-effect to text-decorations.
|
| wrappingStyle->collapseTextDecorationProperties();
|
|
|
| @@ -1022,7 +1017,7 @@ PassRefPtr<EditingStyle> EditingStyle::wrappingStyleForSerialization(Node* conte
|
|
|
| // 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()) {
|
| wrappingStyle->mergeInlineAndImplicitStyleOfElement(static_cast<StyledElement*>(node), EditingStyle::DoNotOverrideValues,
|
| EditingStyle::EditingPropertiesInEffect);
|
| }
|
|
|