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

Unified Diff: third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h

Issue 2755493004: Replace ASSERT, ASSERT_NOT_REACHED, and RELEASE_ASSERT in core/css/ (Closed)
Patch Set: Worked on Review Comments done 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/CSSPrimitiveValueMappings.h
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
index 842f8b6f81f162b12937e2ab7ca6344f2d06a6a1..3e7d4108da6aff2e7f052895e6cb34ad4bf98a5d 100644
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
@@ -57,31 +57,31 @@ namespace blink {
// TODO(sashab): Move these to CSSPrimitiveValue.h.
template <>
inline short CSSPrimitiveValue::convertTo() const {
- ASSERT(isNumber());
+ DCHECK(isNumber());
return clampTo<short>(getDoubleValue());
}
template <>
inline unsigned short CSSPrimitiveValue::convertTo() const {
- ASSERT(isNumber());
+ DCHECK(isNumber());
return clampTo<unsigned short>(getDoubleValue());
}
template <>
inline int CSSPrimitiveValue::convertTo() const {
- ASSERT(isNumber());
+ DCHECK(isNumber());
return clampTo<int>(getDoubleValue());
}
template <>
inline unsigned CSSPrimitiveValue::convertTo() const {
- ASSERT(isNumber());
+ DCHECK(isNumber());
return clampTo<unsigned>(getDoubleValue());
}
template <>
inline float CSSPrimitiveValue::convertTo() const {
- ASSERT(isNumber());
+ DCHECK(isNumber());
return clampTo<float>(getDoubleValue());
}
@@ -100,7 +100,7 @@ inline LineClampValue CSSPrimitiveValue::convertTo() const {
if (type() == UnitType::Percentage)
return LineClampValue(clampTo<int>(m_value.num), LineClampPercentage);
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return LineClampValue();
}
@@ -139,7 +139,7 @@ inline CSSReflectionDirection CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ReflectionBelow;
}
@@ -162,7 +162,7 @@ inline ColumnFill CSSIdentifierValue::convertTo() const {
return ColumnFillBalance;
if (m_valueID == CSSValueAuto)
return ColumnFillAuto;
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ColumnFillBalance;
}
@@ -185,7 +185,7 @@ inline ColumnSpan CSSIdentifierValue::convertTo() const {
case CSSValueAll:
return ColumnSpanAll;
default:
- ASSERT_NOT_REACHED();
+ NOTREACHED();
// fall-through
case CSSValueNone:
return ColumnSpanNone;
@@ -284,7 +284,7 @@ inline CSSIdentifierValue::CSSIdentifierValue(CompositeOperator e)
m_valueID = CSSValuePlusLighter;
break;
default:
- ASSERT_NOT_REACHED();
+ NOTREACHED();
break;
}
}
@@ -320,7 +320,7 @@ inline CompositeOperator CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return CompositeClear;
}
@@ -515,7 +515,7 @@ inline EBackfaceVisibility CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return BackfaceVisibilityHidden;
}
@@ -548,7 +548,7 @@ inline EFillAttachment CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ScrollBackgroundAttachment;
}
@@ -589,7 +589,7 @@ inline EFillBox CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return BorderFillBox;
}
@@ -627,7 +627,7 @@ inline EFillRepeat CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return RepeatFill;
}
@@ -665,7 +665,7 @@ inline EBoxPack CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return BoxPackJustify;
}
@@ -708,7 +708,7 @@ inline EBoxAlignment CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return BSTRETCH;
}
@@ -736,7 +736,7 @@ inline EBoxDecorationBreak CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return BoxDecorationBreakSlice;
}
@@ -774,7 +774,7 @@ inline BackgroundEdgeOrigin CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TopEdge;
}
@@ -802,7 +802,7 @@ inline EBoxSizing CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return EBoxSizing::kBorderBox;
}
@@ -830,7 +830,7 @@ inline EBoxLines CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return SINGLE;
}
@@ -860,7 +860,7 @@ inline EBoxOrient CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return HORIZONTAL;
}
@@ -1230,7 +1230,7 @@ inline EFlexDirection CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return FlowRow;
}
@@ -1263,7 +1263,7 @@ inline EFlexWrap CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return FlexNoWrap;
}
@@ -1296,7 +1296,7 @@ inline EFloat CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return EFloat::kNone;
}
@@ -1372,7 +1372,7 @@ inline LineBreak CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return LineBreakAuto;
}
@@ -1448,7 +1448,7 @@ inline EPosition CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return EPosition::kStatic;
}
@@ -1490,7 +1490,7 @@ inline EResize CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return RESIZE_NONE;
}
@@ -1518,7 +1518,7 @@ inline ETableLayout CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ETableLayout::kAuto;
}
@@ -1571,7 +1571,7 @@ inline TextAlignLast CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TextAlignLastAuto;
}
@@ -1609,7 +1609,7 @@ inline TextJustify CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TextJustifyAuto;
}
@@ -1630,7 +1630,7 @@ inline TextDecoration CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TextDecorationNone;
}
@@ -1651,7 +1651,7 @@ inline TextDecorationStyle CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TextDecorationStyleSolid;
}
@@ -1683,7 +1683,7 @@ inline TextUnderlinePosition CSSIdentifierValue::convertTo() const {
// FIXME: Implement support for 'under left' and 'under right' values.
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TextUnderlinePositionAuto;
}
@@ -1736,7 +1736,7 @@ inline ETextSecurity CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TSNONE;
}
@@ -1771,7 +1771,7 @@ inline EUserDrag CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return DRAG_AUTO;
}
@@ -1804,7 +1804,7 @@ inline EUserModify CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return READ_ONLY;
}
@@ -1839,7 +1839,7 @@ inline EUserSelect CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return SELECT_TEXT;
}
@@ -1904,7 +1904,7 @@ inline EVerticalAlign CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return EVerticalAlign::kTop;
}
@@ -1942,7 +1942,7 @@ inline EWordBreak CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return NormalWordBreak;
}
@@ -1970,7 +1970,7 @@ inline EOverflowWrap CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return NormalOverflowWrap;
}
@@ -1999,7 +1999,7 @@ inline TextCombine CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TextCombineNone;
}
@@ -2027,7 +2027,7 @@ inline RubyPosition CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return RubyPositionBefore;
}
@@ -2055,7 +2055,7 @@ inline TextEmphasisPosition CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TextEmphasisPositionOver;
}
@@ -2083,7 +2083,7 @@ inline TextOverflow CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TextOverflowClip;
}
@@ -2111,7 +2111,7 @@ inline TextEmphasisFill CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TextEmphasisFillFilled;
}
@@ -2137,7 +2137,7 @@ inline CSSIdentifierValue::CSSIdentifierValue(TextEmphasisMark mark)
case TextEmphasisMarkNone:
case TextEmphasisMarkAuto:
case TextEmphasisMarkCustom:
- ASSERT_NOT_REACHED();
+ NOTREACHED();
m_valueID = CSSValueNone;
break;
}
@@ -2162,7 +2162,7 @@ inline TextEmphasisMark CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TextEmphasisMarkNone;
}
@@ -2197,7 +2197,7 @@ inline TextOrientation CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TextOrientationMixed;
}
@@ -2216,7 +2216,7 @@ inline CSSIdentifierValue::CSSIdentifierValue(FontDescription::Kerning kerning)
return;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
m_valueID = CSSValueAuto;
}
@@ -2233,7 +2233,7 @@ inline FontDescription::Kerning CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return FontDescription::AutoKerning;
}
@@ -2273,7 +2273,7 @@ inline ObjectFit CSSIdentifierValue::convertTo() const {
case CSSValueScaleDown:
return ObjectFitScaleDown;
default:
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ObjectFitFill;
}
}
@@ -2293,7 +2293,7 @@ inline CSSIdentifierValue::CSSIdentifierValue(EFillSizeType fillSize)
break;
case SizeLength:
default:
- ASSERT_NOT_REACHED();
+ NOTREACHED();
}
}
@@ -2315,7 +2315,7 @@ inline CSSIdentifierValue::CSSIdentifierValue(FontSmoothingMode smoothing)
return;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
m_valueID = CSSValueAuto;
}
@@ -2334,7 +2334,7 @@ inline FontSmoothingMode CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return AutoSmoothing;
}
@@ -2371,7 +2371,7 @@ inline CSSIdentifierValue::CSSIdentifierValue(FontWeight weight)
return;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
m_valueID = CSSValueNormal;
}
@@ -2404,7 +2404,7 @@ inline FontWeight CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return FontWeightNormal;
}
@@ -2423,7 +2423,7 @@ inline CSSIdentifierValue::CSSIdentifierValue(FontStyle italic)
return;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
m_valueID = CSSValueNormal;
}
@@ -2439,7 +2439,7 @@ inline FontStyle CSSIdentifierValue::convertTo() const {
default:
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return FontStyleNormal;
}
@@ -2476,7 +2476,7 @@ inline CSSIdentifierValue::CSSIdentifierValue(FontStretch stretch)
return;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
m_valueID = CSSValueNormal;
}
@@ -2505,7 +2505,7 @@ inline FontStretch CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return FontStretchNormal;
}
@@ -2543,7 +2543,7 @@ inline TextRenderingMode CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return AutoTextRendering;
}
@@ -2583,7 +2583,7 @@ inline EOrder CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return EOrder::kLogical;
}
@@ -2619,7 +2619,7 @@ inline ESpeak CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return SpeakNormal;
}
@@ -2717,7 +2717,7 @@ inline WebBlendMode CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return WebBlendModeNormal;
}
@@ -2750,7 +2750,7 @@ inline LineCap CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ButtCap;
}
@@ -2783,7 +2783,7 @@ inline LineJoin CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return MiterJoin;
}
@@ -2811,7 +2811,7 @@ inline WindRule CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return RULE_NONZERO;
}
@@ -2889,7 +2889,7 @@ inline EAlignmentBaseline CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return AB_AUTO;
}
@@ -2932,7 +2932,7 @@ inline EImageRendering CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ImageRenderingAuto;
}
@@ -2960,7 +2960,7 @@ inline ETransformStyle3D CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TransformStyle3DFlat;
}
@@ -2993,7 +2993,7 @@ inline EBufferedRendering CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return BR_AUTO;
}
@@ -3026,7 +3026,7 @@ inline EColorInterpolation CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return CI_AUTO;
}
@@ -3059,7 +3059,7 @@ inline EColorRendering CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return CR_AUTO;
}
@@ -3137,7 +3137,7 @@ inline EDominantBaseline CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return DB_AUTO;
}
@@ -3175,7 +3175,7 @@ inline EShapeRendering CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return SR_AUTO;
}
@@ -3208,7 +3208,7 @@ inline ETextAnchor CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TA_START;
}
@@ -3236,7 +3236,7 @@ inline EVectorEffect CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return VE_NONE;
}
@@ -3254,7 +3254,7 @@ inline CSSIdentifierValue::CSSIdentifierValue(EPaintOrderType e)
m_valueID = CSSValueMarkers;
break;
default:
- ASSERT_NOT_REACHED();
+ NOTREACHED();
m_valueID = CSSValueFill;
break;
}
@@ -3273,7 +3273,7 @@ inline EPaintOrderType CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return PT_NONE;
}
@@ -3301,7 +3301,7 @@ inline EMaskType CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return MT_LUMINANCE;
}
@@ -3332,7 +3332,7 @@ inline TouchAction CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return TouchActionNone;
}
@@ -3360,7 +3360,7 @@ inline EIsolation CSSIdentifierValue::convertTo() const {
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return IsolationAuto;
}
@@ -3382,7 +3382,7 @@ inline CSSIdentifierValue::CSSIdentifierValue(CSSBoxType cssBox)
break;
case BoxMissing:
// The missing box should convert to a null primitive value.
- ASSERT_NOT_REACHED();
+ NOTREACHED();
}
}
@@ -3400,7 +3400,7 @@ inline CSSBoxType CSSIdentifierValue::convertTo() const {
default:
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ContentBox;
}
@@ -3489,7 +3489,7 @@ inline ItemPosition CSSIdentifierValue::convertTo() const {
default:
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ItemPositionAuto;
}
@@ -3556,7 +3556,7 @@ inline ContentPosition CSSIdentifierValue::convertTo() const {
default:
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ContentPositionNormal;
}
@@ -3597,7 +3597,7 @@ inline ContentDistributionType CSSIdentifierValue::convertTo() const {
default:
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ContentDistributionStretch;
}
@@ -3628,7 +3628,7 @@ inline OverflowAlignment CSSIdentifierValue::convertTo() const {
default:
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return OverflowAlignmentUnsafe;
}
@@ -3645,7 +3645,7 @@ inline CSSIdentifierValue::CSSIdentifierValue(ScrollBehavior behavior)
case ScrollBehaviorInstant:
// Behavior 'instant' is only allowed in ScrollOptions arguments passed to
// CSSOM scroll APIs.
- ASSERT_NOT_REACHED();
+ NOTREACHED();
}
}
@@ -3659,7 +3659,7 @@ inline ScrollBehavior CSSIdentifierValue::convertTo() const {
default:
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ScrollBehaviorAuto;
}
@@ -3691,7 +3691,7 @@ inline ScrollSnapType CSSIdentifierValue::convertTo() const {
default:
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ScrollSnapTypeNone;
}
@@ -3743,7 +3743,7 @@ inline Containment CSSIdentifierValue::convertTo() const {
default:
break;
}
- ASSERT_NOT_REACHED();
+ NOTREACHED();
return ContainsNone;
}

Powered by Google App Engine
This is Rietveld 408576698