| Index: Source/core/css/CSSParser.cpp
|
| diff --git a/Source/core/css/CSSParser.cpp b/Source/core/css/CSSParser.cpp
|
| index 222b1fb68f531f4494c25aa91bef52b474b825be..16f7e659202a74466b565a81fb63cb8e227bf72f 100644
|
| --- a/Source/core/css/CSSParser.cpp
|
| +++ b/Source/core/css/CSSParser.cpp
|
| @@ -290,9 +290,7 @@ CSSParser::CSSParser(const CSSParserContext& context)
|
| , m_important(false)
|
| , m_id(CSSPropertyInvalid)
|
| , m_styleSheet(0)
|
| -#if ENABLE(CSS3_CONDITIONAL_RULES)
|
| , m_supportsCondition(false)
|
| -#endif
|
| , m_selectorListForParseSelector(0)
|
| , m_numParsedPropertiesBeforeMarginBox(INVALID_NUM_PARSED_PROPERTIES)
|
| , m_inParseShorthand(0)
|
| @@ -468,7 +466,6 @@ PassRefPtr<StyleKeyframe> CSSParser::parseKeyframeRule(StyleSheetContents* sheet
|
| return m_keyframe.release();
|
| }
|
|
|
| -#if ENABLE(CSS3_CONDITIONAL_RULES)
|
| bool CSSParser::parseSupportsCondition(const String& string)
|
| {
|
| m_supportsCondition = false;
|
| @@ -476,7 +473,6 @@ bool CSSParser::parseSupportsCondition(const String& string)
|
| cssyyparse(this);
|
| return m_supportsCondition;
|
| }
|
| -#endif
|
|
|
| static inline bool isColorPropertyID(CSSPropertyID propertyId)
|
| {
|
| @@ -10191,14 +10187,12 @@ inline void CSSParser::detectAtToken(int length, bool hasEscape)
|
| }
|
| return;
|
|
|
| -#if ENABLE(CSS3_CONDITIONAL_RULES)
|
| case 's':
|
| if (length == 9 && isEqualToCSSIdentifier(name + 2, "upports")) {
|
| m_parsingMode = SupportsMode;
|
| m_token = SUPPORTS_SYM;
|
| }
|
| return;
|
| -#endif
|
|
|
| case 't':
|
| if (hasEscape)
|
| @@ -10299,18 +10293,15 @@ inline void CSSParser::detectAtToken(int length, bool hasEscape)
|
| return;
|
|
|
| case 27:
|
| -#if ENABLE(CSS3_CONDITIONAL_RULES)
|
| if (isEqualToCSSIdentifier(name + 2, "webkit-supports-condition")) {
|
| m_parsingMode = SupportsMode;
|
| m_token = WEBKIT_SUPPORTS_CONDITION_SYM;
|
| }
|
| -#endif
|
| return;
|
| }
|
| }
|
| }
|
|
|
| -#if ENABLE(CSS3_CONDITIONAL_RULES)
|
| template <typename CharacterType>
|
| inline void CSSParser::detectSupportsToken(int length)
|
| {
|
| @@ -10327,7 +10318,6 @@ inline void CSSParser::detectSupportsToken(int length)
|
| m_token = SUPPORTS_NOT;
|
| }
|
| }
|
| -#endif
|
|
|
| template <typename SrcCharacterType>
|
| int CSSParser::realLex(void* yylvalWithoutType)
|
| @@ -10368,13 +10358,12 @@ restartAfterComment:
|
| m_token = IDENT;
|
|
|
| if (UNLIKELY(*currentCharacter<SrcCharacterType>() == '(')) {
|
| -#if ENABLE(CSS3_CONDITIONAL_RULES)
|
| if (m_parsingMode == SupportsMode && !hasEscape) {
|
| detectSupportsToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
|
| if (m_token != IDENT)
|
| break;
|
| }
|
| -#endif
|
| +
|
| m_token = FUNCTION;
|
| bool shouldSkipParenthesis = true;
|
| if (!hasEscape) {
|
| @@ -10404,10 +10393,8 @@ restartAfterComment:
|
| } else if (UNLIKELY(m_parsingMode != NormalMode) && !hasEscape) {
|
| if (m_parsingMode == MediaQueryMode)
|
| detectMediaQueryToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
|
| -#if ENABLE(CSS3_CONDITIONAL_RULES)
|
| else if (m_parsingMode == SupportsMode)
|
| detectSupportsToken<SrcCharacterType>(result - tokenStart<SrcCharacterType>());
|
| -#endif
|
| else if (m_parsingMode == NthChildMode && isASCIIAlphaCaselessEqual(tokenStart<SrcCharacterType>()[0], 'n')) {
|
| if (result - tokenStart<SrcCharacterType>() == 1) {
|
| // String "n" is IDENT but "n+1" is NTH.
|
| @@ -10909,7 +10896,6 @@ StyleRuleBase* CSSParser::createMediaRule(MediaQuerySet* media, RuleList* rules)
|
| return result;
|
| }
|
|
|
| -#if ENABLE(CSS3_CONDITIONAL_RULES)
|
| StyleRuleBase* CSSParser::createSupportsRule(bool conditionIsSupported, RuleList* rules)
|
| {
|
| m_allowImportRules = m_allowNamespaceDeclarations = false;
|
| @@ -10967,8 +10953,6 @@ PassRefPtr<CSSRuleSourceData> CSSParser::popSupportsRuleData()
|
| return data.release();
|
| }
|
|
|
| -#endif
|
| -
|
| CSSParser::RuleList* CSSParser::createRuleList()
|
| {
|
| OwnPtr<RuleList> list = adoptPtr(new RuleList);
|
|
|