Move MediaQuery classes off BlinkGC heap

third_party/WebKit/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 200 matching lines @@
          media_feature_ == shapeMediaFeature;
 }
 
 MediaQueryExp::MediaQueryExp(const MediaQueryExp& other)
     : media_feature_(other.MediaFeature()), exp_value_(other.ExpValue()) {}
 
 MediaQueryExp::MediaQueryExp(const String& media_feature,
                              const MediaQueryExpValue& exp_value)
     : media_feature_(media_feature), exp_value_(exp_value) {}
 
-MediaQueryExp* MediaQueryExp::CreateIfValid(
+MediaQueryExp MediaQueryExp::Create(
     const String& media_feature,
     const Vector<CSSParserToken, 4>& token_list) {
   DCHECK(!media_feature.IsNull());
 
   MediaQueryExpValue exp_value;
   String lower_media_feature =
       AttemptStaticStringCreation(media_feature.DeprecatedLower());
 
   // Create value for media query expression that must have 1 or more values.
   if (token_list.size() == 0 && FeatureWithoutValue(lower_media_feature)) {
     // Valid, creates a MediaQueryExp with an 'invalid' MediaQueryExpValue
   } else if (token_list.size() == 1) {
     CSSParserToken token = token_list.front();
 
     if (token.GetType() == kIdentToken) {
       CSSValueID ident = token.Id();
       if (!FeatureWithValidIdent(lower_media_feature, ident))
-        return nullptr;
+        return Invalid();
       exp_value.id = ident;
       exp_value.is_id = true;
     } else if (token.GetType() == kNumberToken ||
                token.GetType() == kPercentageToken ||
                token.GetType() == kDimensionToken) {
       // Check for numeric token types since it is only safe for these types to
       // call numericValue.
       if (FeatureWithValidDensity(lower_media_feature, token) ||
           FeatureWithValidPositiveLength(lower_media_feature, token)) {
         // Media features that must have non-negative <density>, ie. dppx, dpi
         // or dpcm, or Media features that must have non-negative <length> or
         // number value.
         exp_value.value = token.NumericValue();
         exp_value.unit = token.GetUnitType();
         exp_value.is_value = true;
       } else if (FeatureWithPositiveInteger(lower_media_feature, token) ||
                  FeatureWithPositiveNumber(lower_media_feature, token) ||
                  FeatureWithZeroOrOne(lower_media_feature, token)) {
         // Media features that must have non-negative integer value,
         // or media features that must have non-negative number value,
         // or media features that must have (0|1) value.
         exp_value.value = token.NumericValue();
         exp_value.unit = CSSPrimitiveValue::UnitType::kNumber;
         exp_value.is_value = true;
       } else {
-        return nullptr;
+        return Invalid();
       }
     } else {
-      return nullptr;
+      return Invalid();
     }
   } else if (token_list.size() == 3 &&
              FeatureWithAspectRatio(lower_media_feature)) {
     // TODO(timloh): <ratio> is supposed to allow whitespace around the '/'
     // Applicable to device-aspect-ratio and aspect-ratio.
     const CSSParserToken& numerator = token_list[0];
     const CSSParserToken& delimiter = token_list[1];
     const CSSParserToken& denominator = token_list[2];
     if (delimiter.GetType() != kDelimiterToken || delimiter.Delimiter() != '/')
-      return nullptr;
+      return Invalid();
     if (numerator.GetType() != kNumberToken || numerator.NumericValue() <= 0 ||
         numerator.GetNumericValueType() != kIntegerValueType)
-      return nullptr;
+      return Invalid();
     if (denominator.GetType() != kNumberToken ||
         denominator.NumericValue() <= 0 ||
         denominator.GetNumericValueType() != kIntegerValueType)
-      return nullptr;
+      return Invalid();
 
     exp_value.numerator = (unsigned)numerator.NumericValue();
     exp_value.denominator = (unsigned)denominator.NumericValue();
     exp_value.is_ratio = true;
   } else {
-    return nullptr;
+    return Invalid();
   }
 
-  return new MediaQueryExp(lower_media_feature, exp_value);
+  return MediaQueryExp(lower_media_feature, exp_value);
 }
 
 MediaQueryExp::~MediaQueryExp() {}
 
 bool MediaQueryExp::operator==(const MediaQueryExp& other) const {
   return (other.media_feature_ == media_feature_) &&
          ((!other.exp_value_.IsValid() && !exp_value_.IsValid()) ||
           (other.exp_value_.IsValid() && exp_value_.IsValid() &&
            other.exp_value_.Equals(exp_value_)));
 }
@@ skipping 25 matching lines @@
     output.Append('/');
     output.Append(PrintNumber(denominator));
   } else if (is_id) {
     output.Append(getValueName(id));
   }
 
   return output.ToString();
 }
 
 }  // namespace blink