Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(819)

Unified Diff: third_party/WebKit/Source/core/css/MediaQueryExp.cpp

Issue 2837023005: Move MediaQuery classes off BlinkGC heap (Closed)
Patch Set: fix Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/css/MediaQueryExp.cpp
diff --git a/third_party/WebKit/Source/core/css/MediaQueryExp.cpp b/third_party/WebKit/Source/core/css/MediaQueryExp.cpp
index b97736c12ce4037289bb57605c11e3bc8ced42c2..334a816c1505794a601417b2d15411a0a6afe75d 100644
--- a/third_party/WebKit/Source/core/css/MediaQueryExp.cpp
+++ b/third_party/WebKit/Source/core/css/MediaQueryExp.cpp
@@ -218,7 +218,7 @@ 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());
@@ -236,7 +236,7 @@ MediaQueryExp* MediaQueryExp::CreateIfValid(
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 ||
@@ -262,10 +262,10 @@ MediaQueryExp* MediaQueryExp::CreateIfValid(
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)) {
@@ -275,23 +275,23 @@ MediaQueryExp* MediaQueryExp::CreateIfValid(
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() {}

Powered by Google App Engine
This is Rietveld 408576698