Index: WebCore/css/CSSParser.cpp |
=================================================================== |
--- WebCore/css/CSSParser.cpp (revision 148420) |
+++ WebCore/css/CSSParser.cpp (working copy) |
@@ -801,7 +801,6 @@ |
if (valueID == CSSValueVisible || valueID == CSSValueHidden) |
return true; |
break; |
-#if ENABLE(CSS_COMPOSITING) |
case CSSPropertyWebkitBlendMode: |
if (parserContext.isCSSCompositingEnabled && (valueID == CSSValueNormal || valueID == CSSValueMultiply || valueID == CSSValueScreen |
|| valueID == CSSValueOverlay || valueID == CSSValueDarken || valueID == CSSValueLighten || valueID == CSSValueColorDodge |
@@ -810,7 +809,6 @@ |
|| valueID == CSSValueLuminosity)) |
return true; |
break; |
-#endif |
case CSSPropertyWebkitBorderFit: |
if (valueID == CSSValueBorder || valueID == CSSValueLines) |
return true; |
@@ -1057,9 +1055,7 @@ |
case CSSPropertyTextUnderlineStyle: |
case CSSPropertyVisibility: |
case CSSPropertyWebkitAppearance: |
-#if ENABLE(CSS_COMPOSITING) |
case CSSPropertyWebkitBlendMode: |
-#endif |
case CSSPropertyWebkitBackfaceVisibility: |
case CSSPropertyWebkitBorderAfterStyle: |
case CSSPropertyWebkitBorderBeforeStyle: |
@@ -2033,9 +2029,7 @@ |
case CSSPropertyWebkitMaskRepeat: |
case CSSPropertyWebkitMaskRepeatX: |
case CSSPropertyWebkitMaskRepeatY: |
-#if ENABLE(CSS_COMPOSITING) |
case CSSPropertyWebkitBackgroundBlendMode: |
-#endif |
{ |
RefPtr<CSSValue> val1; |
RefPtr<CSSValue> val2; |
@@ -2378,12 +2372,10 @@ |
} |
break; |
#endif |
-#if ENABLE(CSS_COMPOSITING) |
case CSSPropertyWebkitBlendMode: |
if (cssCompositingEnabled()) |
validPrimitive = true; |
break; |
-#endif |
case CSSPropertyWebkitFlex: { |
ShorthandScope scope(this, propId); |
if (id == CSSValueNone) { |
@@ -4236,7 +4228,6 @@ |
m_valueList->next(); |
} |
break; |
-#if ENABLE(CSS_COMPOSITING) |
case CSSPropertyWebkitBackgroundBlendMode: |
if (cssCompositingEnabled() && (val->id == CSSValueNormal || val->id == CSSValueMultiply |
|| val->id == CSSValueScreen || val->id == CSSValueOverlay || val->id == CSSValueDarken |
@@ -4248,7 +4239,6 @@ |
m_valueList->next(); |
} |
break; |
-#endif |
case CSSPropertyBackgroundRepeat: |
case CSSPropertyWebkitMaskRepeat: |
parseFillRepeat(currValue, currValue2); |