Move the CSS Device Adaptation @viewport rule support behind a runtime flag

Source/core/css/CSSParser.cpp

 /*
  * Copyright (C) 2003 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Nicholas Shanks <webkit@nickshanks.com>
  * Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved.
  * Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
@@ skipping 250 matching lines @@
     , m_currentCharacter16(0)
     , m_source(0)
     , m_length(0)
     , m_token(0)
     , m_lineNumber(0)
     , m_tokenStartLineNumber(0)
     , m_lastSelectorLineNumber(0)
     , m_ruleHeaderType(CSSRuleSourceData::UNKNOWN_RULE)
     , m_allowImportRules(true)
     , m_allowNamespaceDeclarations(true)
-#if ENABLE(CSS_DEVICE_ADAPTATION)
     , m_inViewport(false)
-#endif
     , m_useCounter(counter)
 {
 #if YYDEBUG > 0
     cssyydebug = 1;
 #endif
     m_tokenStart.ptr8 = 0;
     CSSPropertySourceData::init();
 }
 
 CSSParser::~CSSParser()
@@ skipping 1414 matching lines @@
 
     if (isKeywordPropertyID(propId)) {
         if (!isValidKeywordPropertyAndValue(propId, id, m_context))
             return false;
         if (m_valueList->next() && !inShorthand())
             return false;
         addProperty(propId, cssValuePool().createIdentifierValue(id), important);
         return true;
     }
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
-    if (inViewport())
+    if (inViewport()) {
+        if (!RuntimeEnabledFeatures::cssViewportEnabled())
+            return false;
+
         return parseViewportProperty(propId, important);
-#endif
+    }
 
     bool validPrimitive = false;
     RefPtr<CSSValue> parsedValue;
 
     switch (propId) {
     case CSSPropertySize:                 // <length>{1,2} | auto | [ <page-size> || [ portrait | landscape] ]
         return parseSize(propId, important);
 
     case CSSPropertyQuotes:               // [<string> <string>]+ | none | inherit
         if (id)
@@ skipping 1114 matching lines @@
     case CSSPropertyWebkitUserSelect:
     case CSSPropertyWebkitWrapFlow:
     case CSSPropertyWebkitWrapThrough:
     case CSSPropertyWebkitWritingMode:
     case CSSPropertyWhiteSpace:
     case CSSPropertyWordBreak:
     case CSSPropertyWordWrap:
         // These properties should be handled before in isValidKeywordPropertyAndValue().
         ASSERT_NOT_REACHED();
         return false;
-#if ENABLE(CSS_DEVICE_ADAPTATION)
     // Properties bellow are validated inside parseViewportProperty, because we
     // check for parser state inViewportScope. We need to invalidate if someone
     // adds them outside a @viewport rule.
     case CSSPropertyMaxZoom:
     case CSSPropertyMinZoom:
     case CSSPropertyOrientation:
     case CSSPropertyUserZoom:
         validPrimitive = false;
         break;
-#endif
     default:
         return parseSVGValue(propId, important);
     }
 
     if (validPrimitive) {
         parsedValue = parseValidPrimitive(id, value);
         m_valueList->next();
     }
     ASSERT(!m_parsedCalculation);
     if (parsedValue) {
@@ skipping 7383 matching lines @@
             if (isASCIIAlphaCaselessEqual(name[15], 's') && isEqualToCSSIdentifier(name + 2, "internal-decl"))
                 m_token = INTERNAL_DECLS_SYM;
             else if (isASCIIAlphaCaselessEqual(name[15], 'e') && isEqualToCSSIdentifier(name + 2, "internal-valu"))
                 m_token = INTERNAL_VALUE_SYM;
             return;
 
         case 17:
             if (hasEscape)
                 return;
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
             else if (isASCIIAlphaCaselessEqual(name[16], 't') && isEqualToCSSIdentifier(name + 2, "webkit-viewpor"))
                 m_token = WEBKIT_VIEWPORT_RULE_SYM;
-#endif
             return;
 
         case 18:
             if (isEqualToCSSIdentifier(name + 2, "webkit-keyframes"))
                 m_token = WEBKIT_KEYFRAMES_SYM;
             return;
 
         case 19:
             if (!hasEscape && isASCIIAlphaCaselessEqual(name[18], 'r') && isEqualToCSSIdentifier(name + 2, "internal-selecto")) {
                 m_token = INTERNAL_SELECTOR_SYM;
@@ skipping 1179 matching lines @@
 {
     if (m_sourceDataHandler)
         m_sourceDataHandler->startEndUnknownRule();
 }
 
 unsigned CSSParser::safeUserStringTokenOffset()
 {
     return min(tokenStartOffset(), static_cast<unsigned>(m_length - 1 - m_parsedTextSuffixLength)) - m_parsedTextPrefixLength;
 }
 
-#if ENABLE(CSS_DEVICE_ADAPTATION)
 StyleRuleBase* CSSParser::createViewportRule()
 {
+    if (!RuntimeEnabledFeatures::cssViewportEnabled())
+        return 0;
+
     m_allowImportRules = m_allowNamespaceDeclarations = false;
 
     RefPtr<StyleRuleViewport> rule = StyleRuleViewport::create();
 
     rule->setProperties(createStylePropertySet());
     clearProperties();
 
     StyleRuleViewport* result = rule.get();
     m_parsedRules.append(rule.release());
     endRuleBody();
 
     return result;
 }
 
 bool CSSParser::parseViewportProperty(CSSPropertyID propId, bool important)
 {
+    ASSERT(RuntimeEnabledFeatures::cssViewportEnabled());
+
     CSSParserValue* value = m_valueList->current();
     if (!value)
         return false;
 
-    int id = value->id;
+    CSSValueID id = value->id;
     bool validPrimitive = false;
 
     switch (propId) {
     case CSSPropertyMinWidth: // auto | device-width | device-height | <length> | <percentage>
     case CSSPropertyMaxWidth:
     case CSSPropertyMinHeight:
     case CSSPropertyMaxHeight:
         if (id == CSSValueAuto || id == CSSValueDeviceWidth || id == CSSValueDeviceHeight)
             validPrimitive = true;
         else
@@ skipping 33 matching lines @@
             addProperty(propId, parsedValue.release(), important);
             return true;
         }
     }
 
     return false;
 }
 
 bool CSSParser::parseViewportShorthand(CSSPropertyID propId, CSSPropertyID first, CSSPropertyID second, bool important)
 {
+    ASSERT(RuntimeEnabledFeatures::cssViewportEnabled());
     unsigned numValues = m_valueList->size();
 
     if (numValues > 2)
         return false;
 
     ShorthandScope scope(this, propId);
 
     if (!parseViewportProperty(first, important))
         return false;
 
     // If just one value is supplied, the second value
     // is implicitly initialized with the first value.
     if (numValues == 1)
         m_valueList->previous();
 
     return parseViewportProperty(second, important);
 }
-#endif
 
 template <typename CharacterType>
 static CSSPropertyID cssPropertyID(const CharacterType* propertyName, unsigned length)
 {
     char buffer[maxCSSPropertyNameLength + 1 + 1]; // 1 to turn "apple"/"khtml" into "webkit", 1 for null character
 
     for (unsigned i = 0; i != length; ++i) {
         CharacterType c = propertyName[i];
         if (c == 0 || c >= 0x7F)
             return CSSPropertyInvalid; // illegal character
@@ skipping 236 matching lines @@
 {
     // The tokenizer checks for the construct of an+b.
     // However, since the {ident} rule precedes the {nth} rule, some of those
     // tokens are identified as string literal. Furthermore we need to accept
     // "odd" and "even" which does not match to an+b.
     return equalIgnoringCase(token, "odd") || equalIgnoringCase(token, "even")
         || equalIgnoringCase(token, "n") || equalIgnoringCase(token, "-n");
 }
 
 }