Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Unified Diff: third_party/WebKit/Source/core/editing/serializers/StyledMarkupAccumulator.cpp

Issue 1522063002: Allow -webkit-text-decorations-in-effect preservation during para move. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/editing/execCommand/justify-right-in-effect-crash-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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=\"");
« no previous file with comments | « third_party/WebKit/LayoutTests/editing/execCommand/justify-right-in-effect-crash-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698