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

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

Issue 15012010: Remove the CSS_COMPOSITING define, leaving the implementation under the runtime flag, since runtime… (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: removed bogus test Created 7 years, 7 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/CSSParser.cpp ('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 be7b0091d4fec27a9a47d64323ffd72747baeb2f..3c99ca464d56e700715b55486dcb43a4679f4060 100644
--- a/Source/core/css/CSSProperty.cpp
+++ b/Source/core/css/CSSProperty.cpp
@@ -371,9 +371,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)
case CSSPropertyZoom:
case CSSPropertyBackground:
case CSSPropertyBackgroundAttachment:
-#if ENABLE(CSS_COMPOSITING)
case CSSPropertyBackgroundBlendMode:
-#endif
case CSSPropertyBackgroundClip:
case CSSPropertyBackgroundColor:
case CSSPropertyBackgroundImage:
@@ -437,9 +435,7 @@ bool CSSProperty::isInheritedProperty(CSSPropertyID propertyID)
case CSSPropertyMaxWidth:
case CSSPropertyMinHeight:
case CSSPropertyMinWidth:
-#if ENABLE(CSS_COMPOSITING)
case CSSPropertyMixBlendMode:
-#endif
case CSSPropertyOpacity:
case CSSPropertyOutline:
case CSSPropertyOutlineColor:
« no previous file with comments | « Source/core/css/CSSParser.cpp ('k') | Source/core/css/CSSPropertyNames.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698