Index: Source/core/css/CSSParser.cpp |
diff --git a/Source/core/css/CSSParser.cpp b/Source/core/css/CSSParser.cpp |
index 1e98417e926e259dd4aa435f32695090671bc8d4..362023db4eadbb370a067f6b570dde954c491626 100644 |
--- a/Source/core/css/CSSParser.cpp |
+++ b/Source/core/css/CSSParser.cpp |
@@ -919,7 +919,6 @@ static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int |
if (valueID == CSSValueExact || valueID == CSSValueEconomy) |
return true; |
break; |
-#if ENABLE(CSS_REGIONS) |
case CSSPropertyWebkitRegionBreakAfter: |
case CSSPropertyWebkitRegionBreakBefore: |
if (parserContext.isCSSRegionsEnabled && (valueID == CSSValueAuto || valueID == CSSValueAlways || valueID == CSSValueAvoid || valueID == CSSValueLeft || valueID == CSSValueRight)) |
@@ -933,7 +932,6 @@ static inline bool isValidKeywordPropertyAndValue(CSSPropertyID propertyId, int |
if (parserContext.isCSSRegionsEnabled && (valueID == CSSValueAuto || valueID == CSSValueBreak)) |
return true; |
break; |
-#endif |
case CSSPropertyWebkitRtlOrdering: |
if (valueID == CSSValueLogical || valueID == CSSValueVisual) |
return true; |
@@ -1098,12 +1096,10 @@ static inline bool isKeywordPropertyID(CSSPropertyID propertyId) |
case CSSPropertyWebkitOverflowScrolling: |
#endif |
case CSSPropertyWebkitPrintColorAdjust: |
-#if ENABLE(CSS_REGIONS) |
case CSSPropertyWebkitRegionBreakAfter: |
case CSSPropertyWebkitRegionBreakBefore: |
case CSSPropertyWebkitRegionBreakInside: |
case CSSPropertyWebkitRegionOverflow: |
-#endif |
case CSSPropertyWebkitRtlOrdering: |
case CSSPropertyWebkitRubyPosition: |
#if ENABLE(CSS3_TEXT) |
@@ -2431,7 +2427,6 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important) |
else |
validPrimitive = validUnit(value, FTime | FInteger | FNonNeg); |
break; |
-#if ENABLE(CSS_REGIONS) |
case CSSPropertyWebkitFlowInto: |
if (!cssRegionsEnabled()) |
return false; |
@@ -2440,7 +2435,6 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important) |
if (!cssRegionsEnabled()) |
return false; |
return parseRegionThread(propId, important); |
-#endif |
case CSSPropertyWebkitTransform: |
if (id == CSSValueNone) |
validPrimitive = true; |
@@ -2927,12 +2921,10 @@ bool CSSParser::parseValue(CSSPropertyID propId, bool important) |
case CSSPropertyWebkitOverflowScrolling: |
#endif |
case CSSPropertyWebkitPrintColorAdjust: |
-#if ENABLE(CSS_REGIONS) |
case CSSPropertyWebkitRegionBreakAfter: |
case CSSPropertyWebkitRegionBreakBefore: |
case CSSPropertyWebkitRegionBreakInside: |
case CSSPropertyWebkitRegionOverflow: |
-#endif |
case CSSPropertyWebkitRtlOrdering: |
case CSSPropertyWebkitRubyPosition: |
#if ENABLE(CSS3_TEXT) |
@@ -8681,7 +8673,6 @@ PassRefPtr<CSSValueList> CSSParser::parseFilter() |
return list.release(); |
} |
-#if ENABLE(CSS_REGIONS) |
static bool validFlowName(const String& flowName) |
{ |
return !(equalIgnoringCase(flowName, "auto") |
@@ -8690,7 +8681,6 @@ static bool validFlowName(const String& flowName) |
|| equalIgnoringCase(flowName, "initial") |
|| equalIgnoringCase(flowName, "none")); |
} |
-#endif |
bool CSSParser::cssRegionsEnabled() const |
eseidel
2013/04/27 03:40:50
What is this for? Doesn't RuntimeEnabledFeatures
|
{ |
@@ -8707,7 +8697,6 @@ bool CSSParser::cssGridLayoutEnabled() const |
return m_context.isCSSGridLayoutEnabled; |
} |
-#if ENABLE(CSS_REGIONS) |
bool CSSParser::parseFlowThread(const String& flowName) |
{ |
setupParser("@-internal-decls{-webkit-flow-into:", flowName, "}"); |
@@ -8780,7 +8769,6 @@ bool CSSParser::parseRegionThread(CSSPropertyID propId, bool important) |
return true; |
} |
-#endif |
bool CSSParser::parseTransformOrigin(CSSPropertyID propId, CSSPropertyID& propId1, CSSPropertyID& propId2, CSSPropertyID& propId3, RefPtr<CSSValue>& value, RefPtr<CSSValue>& value2, RefPtr<CSSValue>& value3) |
{ |
@@ -10241,12 +10229,11 @@ inline void CSSParser::detectAtToken(int length, bool hasEscape) |
return; |
} |
-#if ENABLE(CSS_REGIONS) |
if (isASCIIAlphaCaselessEqual(name[14], 'n') && isEqualToCSSIdentifier(name + 2, "webkit-regio")) { |
m_token = WEBKIT_REGION_RULE_SYM; |
return; |
} |
-#endif |
+ |
if (isASCIIAlphaCaselessEqual(name[14], 'r') && isEqualToCSSIdentifier(name + 2, "webkit-filte")) { |
m_token = WEBKIT_FILTER_RULE_SYM; |
return; |