Add property parser code path based on CSSParserTokenRange

Source/core/css/MediaQueryExp.cpp

 /*
  * CSS Media Query
  *
  * Copyright (C) 2006 Kimmo Kinnunen <kimmo.t.kinnunen@nokia.com>.
  * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 12 matching lines @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/css/MediaQueryExp.h"
 
-#include "core/css/CSSPrimitiveValue.h"
 #include "core/css/parser/CSSParserToken.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "platform/Decimal.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "wtf/text/StringBuffer.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 using namespace MediaFeatureNames;
@@ skipping 138 matching lines @@
     , m_expValue(other.expValue())
 {
 }
 
 MediaQueryExp::MediaQueryExp(const String& mediaFeature, const MediaQueryExpValue& expValue)
     : m_mediaFeature(mediaFeature)
     , m_expValue(expValue)
 {
 }
 
-CSSValueID cssValueKeywordID(const CSSParserString&);
-
 PassOwnPtrWillBeRawPtr<MediaQueryExp> MediaQueryExp::createIfValid(const String& mediaFeature, const Vector<CSSParserToken, 4>& tokenList)
 {
     ASSERT(!mediaFeature.isNull());
 
     MediaQueryExpValue expValue;
     String lowerMediaFeature = attemptStaticStringCreation(mediaFeature.lower());
 
     // Create value for media query expression that must have 1 or more values.
     if (tokenList.size() == 0 && featureWithoutValue(lowerMediaFeature)) {
         // Valid, creates a MediaQueryExp with an 'invalid' MediaQueryExpValue
     } else if (tokenList.size() == 1) {
         CSSParserToken token = tokenList.first();
 
         if (token.type() == IdentToken) {
-            CSSValueID ident = cssValueKeywordID(token.value());
+            CSSValueID ident = token.id();
             if (!featureWithValidIdent(lowerMediaFeature, ident))
                 return nullptr;
             expValue.id = ident;
             expValue.unit = CSSPrimitiveValue::UnitType::ValueID;
             expValue.isID = true;
         } else if (token.type() == NumberToken || token.type() == PercentageToken || token.type() == DimensionToken) {
             // Check for numeric token types since it is only safe for these types to call numericValue.
             if (featureWithValidDensity(lowerMediaFeature, token)
                 || featureWithValidPositiveLength(lowerMediaFeature, token)) {
                 // Media features that must have non-negative <density>, ie. dppx, dpi or dpcm,
@@ skipping 80 matching lines @@
         output.append('/');
         output.append(printNumber(denominator));
     } else if (isID) {
         output.append(getValueName(id));
     }
 
     return output.toString();
 }
 
 } // namespace