Move MediaQuery classes off BlinkGC heap

third_party/WebKit/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 "core/css/parser/MediaQueryParser.h"
 
 #include "core/MediaTypeNames.h"
 #include "core/css/parser/CSSTokenizer.h"
 #include "wtf/Vector.h"
 
 namespace blink {
 
-MediaQuerySet* MediaQueryParser::parseMediaQuerySet(const String& queryString) {
+RefPtr<MediaQuerySet> MediaQueryParser::parseMediaQuerySet(
+    const String& queryString) {
   return parseMediaQuerySet(CSSTokenizer(queryString).tokenRange());
 }
 
-MediaQuerySet* MediaQueryParser::parseMediaQuerySet(CSSParserTokenRange range) {
+RefPtr<MediaQuerySet> MediaQueryParser::parseMediaQuerySet(
+    CSSParserTokenRange range) {
   return MediaQueryParser(MediaQuerySetParser).parseImpl(range);
 }
 
-MediaQuerySet* MediaQueryParser::parseMediaCondition(
+RefPtr<MediaQuerySet> MediaQueryParser::parseMediaCondition(
     CSSParserTokenRange range) {
   return MediaQueryParser(MediaConditionParser).parseImpl(range);
 }
 
 const MediaQueryParser::State MediaQueryParser::ReadRestrictor =
     &MediaQueryParser::readRestrictor;
 const MediaQueryParser::State MediaQueryParser::ReadMediaNot =
     &MediaQueryParser::readMediaNot;
 const MediaQueryParser::State MediaQueryParser::ReadMediaType =
     &MediaQueryParser::readMediaType;
@@ skipping 186 matching lines @@
 
   handleBlocks(token);
   m_blockWatcher.handleToken(token);
 
   // Call the function that handles current state
   if (type != WhitespaceToken)
     ((this)->*(m_state))(type, token);
 }
 
 // The state machine loop
-MediaQuerySet* MediaQueryParser::parseImpl(CSSParserTokenRange range) {
+RefPtr<MediaQuerySet> MediaQueryParser::parseImpl(CSSParserTokenRange range) {
   while (!range.atEnd())
     processToken(range.consume());
 
   // FIXME: Can we get rid of this special case?
   if (m_parserType == MediaQuerySetParser)
     processToken(CSSParserToken(EOFToken));
 
   if (m_state != ReadAnd && m_state != ReadRestrictor && m_state != Done &&
       m_state != ReadMediaNot)
     m_querySet->addMediaQuery(MediaQuery::createNotAll());
@@ skipping 10 matching lines @@
 
 void MediaQueryData::clear() {
   m_restrictor = MediaQuery::None;
   m_mediaType = MediaTypeNames::all;
   m_mediaTypeSet = false;
   m_mediaFeature = String();
   m_valueList.clear();
   m_expressions.clear();
 }
 
-MediaQuery* MediaQueryData::takeMediaQuery() {
-  MediaQuery* mediaQuery = MediaQuery::create(
+std::unique_ptr<MediaQuery> MediaQueryData::takeMediaQuery() {
+  std::unique_ptr<MediaQuery> mediaQuery = MediaQuery::create(
       m_restrictor, std::move(m_mediaType), std::move(m_expressions));
   clear();
   return mediaQuery;
 }
 
 bool MediaQueryData::addExpression() {
-  MediaQueryExp* expression =
-      MediaQueryExp::createIfValid(m_mediaFeature, m_valueList);
-  bool isValid = !!expression;
+  MediaQueryExp expression = MediaQueryExp::create(m_mediaFeature, m_valueList);
   m_expressions.push_back(expression);
   m_valueList.clear();
-  return isValid;
+  return expression.isValid();
 }
 
 bool MediaQueryData::tryAddParserToken(CSSParserTokenType type,
                                        const CSSParserToken& token) {
   if (type == NumberToken || type == PercentageToken ||
       type == DimensionToken || type == DelimiterToken || type == IdentToken) {
     m_valueList.push_back(token);
     return true;
   }
 
   return false;
 }
 
 void MediaQueryData::setMediaType(const String& mediaType) {
   m_mediaType = mediaType;
   m_mediaTypeSet = true;
 }
 
 }  // namespace blink