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

Unified Diff: third_party/WebKit/Source/core/editing/EditingStyle.cpp

Issue 2532873002: Get rid of wrong assumption in reconcileTextDecorationProperties() (Closed)
Patch Set: 2016-11-28T18:40:32 Created 4 years, 1 month 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/insert-list-and-strikethrough.html ('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/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());
« no previous file with comments | « third_party/WebKit/LayoutTests/editing/execCommand/insert-list-and-strikethrough.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698