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

Unified Diff: Source/core/css/StylePropertyShorthandCustom.cpp

Issue 339713008: Treat marker like a real shorthand for initial and inherit (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Shorthand change Created 6 years, 2 months 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 | « Source/build/scripts/templates/StylePropertyShorthand.cpp.tmpl ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/StylePropertyShorthandCustom.cpp
diff --git a/Source/core/css/StylePropertyShorthandCustom.cpp b/Source/core/css/StylePropertyShorthandCustom.cpp
index 8140b8a64edebf09685b64c4cf439fb859b9d81e..66c19c67ce1dc8baa10c6e11392bb7bfa0025b44 100644
--- a/Source/core/css/StylePropertyShorthandCustom.cpp
+++ b/Source/core/css/StylePropertyShorthandCustom.cpp
@@ -152,8 +152,7 @@ bool isExpandedShorthandForAll(CSSPropertyID propertyId)
// And while applying "all" property, we cannot apply "font" property
// directly. This causes ASSERT crash, because StyleBuilder assume that
// all given properties are not expanded shorthands.
- // "marker" has the same issue.
- if (propertyId == CSSPropertyMarker || propertyId == CSSPropertyFont)
+ if (propertyId == CSSPropertyFont)
return true;
return shorthandForProperty(propertyId).length();
}
« no previous file with comments | « Source/build/scripts/templates/StylePropertyShorthand.cpp.tmpl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698