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

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

Issue 350333003: Cascade declared property values instead of applying values on top of each other (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 4 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/core/css/CSSProperties.in ('k') | Source/core/css/CSSPropertyNames.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSProperty.cpp
diff --git a/Source/core/css/CSSProperty.cpp b/Source/core/css/CSSProperty.cpp
index 1c99ce6133f85aa46b6f7e19bf9260b23810a16e..1d6ec003ca1b43ab90ab1171b5200f7095488a60 100644
--- a/Source/core/css/CSSProperty.cpp
+++ b/Source/core/css/CSSProperty.cpp
@@ -673,16 +673,15 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)
bool CSSProperty::isAffectedByAllProperty(CSSPropertyID propertyID)
{
- if (propertyID == CSSPropertyAll)
- return false;
-
// all shorthand spec says:
// The all property is a shorthand that resets all CSS properties except
// direction and unicode-bidi. It only accepts the CSS-wide keywords.
// c.f. http://dev.w3.org/csswg/css-cascade/#all-shorthand
- // So CSSPropertyUnicodeBidi and CSSPropertyDirection are not
- // affected by all property.
- return propertyID != CSSPropertyUnicodeBidi && propertyID != CSSPropertyDirection;
+ return propertyID != CSSPropertyAll
+ && propertyID != CSSPropertyUnicodeBidi
+ && propertyID != CSSPropertyDirection
+ && propertyID != CSSPropertyInternalCallback
+ && !isExpandedShorthandForAll(propertyID);
}
} // namespace blink
« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/CSSPropertyNames.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698