| Index: third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp
|
| index 63bbd2928faa127306f78d66525e40e2b124e0ad..7c62a93287f71181ade7d85b94d3bb294f6655f8 100644
|
| --- a/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp
|
| @@ -97,8 +97,8 @@ void StyledMarkupAccumulator::appendText(Text& text)
|
| void StyledMarkupAccumulator::appendTextWithInlineStyle(Text& text, PassRefPtrWillBeRawPtr<EditingStyle> inlineStyle)
|
| {
|
| if (inlineStyle) {
|
| - // wrappingStyleForSerialization should have removed -webkit-text-decorations-in-effect
|
| - ASSERT(propertyMissingOrEqualToNone(inlineStyle->style(), CSSPropertyWebkitTextDecorationsInEffect));
|
| + // wrappingStyleForAnnotatedSerialization should have removed -webkit-text-decorations-in-effect
|
| + ASSERT(!shouldAnnotate() || propertyMissingOrEqualToNone(inlineStyle->style(), CSSPropertyWebkitTextDecorationsInEffect));
|
| ASSERT(m_document);
|
|
|
| m_result.appendLiteral("<span style=\"");
|
|
|