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

Unified Diff: third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp

Issue 2755493004: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in core/css/ (Closed)
Patch Set: All windows error are Resolved now. Created 3 years, 9 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/parser/CSSParserToken.cpp
diff --git a/third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp b/third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp
index ab202afea7411fb658bfe36acd5985b8e22dd42c..309d9867d46924cd6824a38a7d896fa5bb332aa7 100644
--- a/third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp
+++ b/third_party/WebKit/Source/core/css/parser/CSSParserToken.cpp
@@ -19,7 +19,7 @@ CSSParserToken::CSSParserToken(CSSParserTokenType type, BlockType blockType)
// Just a helper used for Delimiter tokens.
CSSParserToken::CSSParserToken(CSSParserTokenType type, UChar c)
: m_type(type), m_blockType(NotBlock), m_delimiter(c) {
- ASSERT(m_type == DelimiterToken);
+ DCHECK_EQ(m_type, static_cast<unsigned>(DelimiterToken));
}
CSSParserToken::CSSParserToken(CSSParserTokenType type,
@@ -39,7 +39,7 @@ CSSParserToken::CSSParserToken(CSSParserTokenType type,
m_numericValueType(numericValueType),
m_numericSign(sign),
m_unit(static_cast<unsigned>(CSSPrimitiveValue::UnitType::Number)) {
- ASSERT(type == NumberToken);
+ DCHECK_EQ(type, NumberToken);
m_numericValue =
clampTo<double>(numericValue, -std::numeric_limits<float>::max(),
std::numeric_limits<float>::max());
@@ -60,44 +60,44 @@ CSSParserToken::CSSParserToken(HashTokenType type, StringView value)
}
void CSSParserToken::convertToDimensionWithUnit(StringView unit) {
- ASSERT(m_type == NumberToken);
+ DCHECK_EQ(m_type, static_cast<unsigned>(NumberToken));
m_type = DimensionToken;
initValueFromStringView(unit);
m_unit = static_cast<unsigned>(CSSPrimitiveValue::stringToUnitType(unit));
}
void CSSParserToken::convertToPercentage() {
- ASSERT(m_type == NumberToken);
+ DCHECK_EQ(m_type, static_cast<unsigned>(NumberToken));
m_type = PercentageToken;
m_unit = static_cast<unsigned>(CSSPrimitiveValue::UnitType::Percentage);
}
UChar CSSParserToken::delimiter() const {
- ASSERT(m_type == DelimiterToken);
+ DCHECK_EQ(m_type, static_cast<unsigned>(DelimiterToken));
return m_delimiter;
}
NumericSign CSSParserToken::numericSign() const {
// This is valid for DimensionToken and PercentageToken, but only used
// in <an+b> parsing on NumberTokens.
- ASSERT(m_type == NumberToken);
+ DCHECK_EQ(m_type, static_cast<unsigned>(NumberToken));
return static_cast<NumericSign>(m_numericSign);
}
NumericValueType CSSParserToken::numericValueType() const {
- ASSERT(m_type == NumberToken || m_type == PercentageToken ||
+ DCHECK(m_type == NumberToken || m_type == PercentageToken ||
m_type == DimensionToken);
return static_cast<NumericValueType>(m_numericValueType);
}
double CSSParserToken::numericValue() const {
- ASSERT(m_type == NumberToken || m_type == PercentageToken ||
+ DCHECK(m_type == NumberToken || m_type == PercentageToken ||
m_type == DimensionToken);
return m_numericValue;
}
CSSPropertyID CSSParserToken::parseAsUnresolvedCSSPropertyID() const {
- ASSERT(m_type == IdentToken);
+ DCHECK_EQ(m_type, static_cast<unsigned>(IdentToken));
return unresolvedCSSPropertyID(value());
}
@@ -278,7 +278,7 @@ void CSSParserToken::serialize(StringBuilder& builder) const {
case EOFToken:
case CommentToken:
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return;
}
}

Powered by Google App Engine
This is Rietveld 408576698