Remove usage of CSSParserValue in MediaQueryParser

Source/core/css/parser/MediaQueryParser.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/css/parser/MediaQueryParser.h"
 
 #include "core/MediaTypeNames.h"
 #include "core/css/parser/CSSPropertyParser.h"
 #include "core/css/parser/CSSTokenizer.h"
@@ skipping 138 matching lines @@
         readFeatureEnd(type, token);
     else
         m_state = SkipUntilBlockEnd;
 }
 
 void MediaQueryParser::readFeatureValue(CSSParserTokenType type, const CSSParserToken& token)
 {
     if (type == DimensionToken && token.unitType() == CSSPrimitiveValue::CSS_UNKNOWN) {
         m_state = SkipUntilComma;
     } else {
-        if (m_mediaQueryData.tryAddParserValue(type, token))
+        if (m_mediaQueryData.tryAddParserToken(type, token))
             m_state = ReadFeatureEnd;
         else
             m_state = SkipUntilBlockEnd;
     }
 }
 
 void MediaQueryParser::readFeatureEnd(CSSParserTokenType type, const CSSParserToken& token)
 {
     if (type == RightParenthesisToken || type == EOFToken) {
         if (m_mediaQueryData.addExpression())
             m_state = ReadAnd;
         else
             m_state = SkipUntilComma;
     } else if (type == DelimiterToken && token.delimiter() == '/') {
-        m_mediaQueryData.tryAddParserValue(type, token);
+        m_mediaQueryData.tryAddParserToken(type, token);
         m_state = ReadFeatureValue;
     } else {
         m_state = SkipUntilBlockEnd;
     }
 }
 
 void MediaQueryParser::skipUntilComma(CSSParserTokenType type, const CSSParserToken& token)
 {
     if ((type == CommaToken && !m_blockWatcher.blockLevel()) || type == EOFToken) {
         m_state = ReadRestrictor;
@@ skipping 54 matching lines @@
     , m_mediaTypeSet(false)
 {
 }
 
 void MediaQueryData::clear()
 {
     m_restrictor = MediaQuery::None;
     m_mediaType = MediaTypeNames::all;
     m_mediaTypeSet = false;
     m_mediaFeature = String();
-    m_valueList.destroyAndClear();
+    m_valueList.clear();
     m_expressions = adoptPtrWillBeNoop(new ExpressionHeapVector);
 }
 
 PassOwnPtrWillBeRawPtr<MediaQuery> MediaQueryData::takeMediaQuery()
 {
     OwnPtrWillBeRawPtr<MediaQuery> mediaQuery = adoptPtrWillBeNoop(new MediaQuery(m_restrictor, m_mediaType, m_expressions.release()));
     clear();
     return mediaQuery.release();
 }
 
 bool MediaQueryData::addExpression()
 {
-    OwnPtrWillBeRawPtr<MediaQueryExp> expression = MediaQueryExp::createIfValid(m_mediaFeature, &m_valueList);
+    OwnPtrWillBeRawPtr<MediaQueryExp> expression = MediaQueryExp::createIfValid(m_mediaFeature, m_valueList);
     bool isValid = !!expression;
     m_expressions->append(expression.release());
-    m_valueList.destroyAndClear();
+    m_valueList.clear();
     return isValid;
 }
 
-bool MediaQueryData::tryAddParserValue(CSSParserTokenType type, const CSSParserToken& token)
+bool MediaQueryData::tryAddParserToken(CSSParserTokenType type, const CSSParserToken& token)
 {
-    CSSParserValue value;
-    if (type == NumberToken || type == PercentageToken || type == DimensionToken) {
-        value.setFromNumber(token.numericValue(), token.unitType());
-        value.isInt = (token.numericValueType() == IntegerValueType);
-    } else if (type == DelimiterToken) {
-        value.unit = CSSParserValue::Operator;
-        value.iValue = token.delimiter();
-        value.id = CSSValueInvalid;
-        value.isInt = false;
-    } else if (type == IdentToken) {
-        value.unit = CSSPrimitiveValue::CSS_IDENT;
-        value.string = token.value();
-        value.id = cssValueKeywordID(token.value());
-        value.isInt = false;
-    } else {
-        return false;
+    if (type == NumberToken || type == PercentageToken || type == DimensionToken
+        || type == DelimiterToken || type == IdentToken) {
+        m_valueList.append(token);
+        return true;
     }
-    m_valueList.addValue(value);
-    return true;
+
+    return false;
 }
 
 void MediaQueryData::setMediaType(const String& mediaType)
 {
     m_mediaType = mediaType;
     m_mediaTypeSet = true;
 }
 
 } // namespace blink