| Index: third_party/WebKit/Source/core/editing/EditingStyle.cpp
|
| diff --git a/third_party/WebKit/Source/core/editing/EditingStyle.cpp b/third_party/WebKit/Source/core/editing/EditingStyle.cpp
|
| index 1f67ac5d878431c45a118778b5025b5744bca78e..6bbf51cc69d97ecc102cda3244e071b512a9402f 100644
|
| --- a/third_party/WebKit/Source/core/editing/EditingStyle.cpp
|
| +++ b/third_party/WebKit/Source/core/editing/EditingStyle.cpp
|
| @@ -1709,9 +1709,8 @@ static void reconcileTextDecorationProperties(MutableStylePropertySet* style) {
|
| style->getPropertyCSSValue(CSSPropertyWebkitTextDecorationsInEffect);
|
| const CSSValue* textDecoration =
|
| style->getPropertyCSSValue(textDecorationPropertyForEditing());
|
| - // We shouldn't have both text-decoration and
|
| - // -webkit-text-decorations-in-effect because that wouldn't make sense.
|
| - DCHECK(!textDecorationsInEffect || !textDecoration);
|
| + // "LayoutTests/editing/execCommand/insert-list-and-strikethrough.html" makes
|
| + // both |textDecorationsInEffect| and |textDecoration| non-null.
|
| if (textDecorationsInEffect) {
|
| style->setProperty(textDecorationPropertyForEditing(),
|
| textDecorationsInEffect->cssText());
|
|
|