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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1265903002: CSSValue Immediates: Remove redundant isTaggedPtr() checks (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@tagged_ptrs_base
Patch Set: Created 5 years, 5 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
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSPrimitiveValueMappings.h
diff --git a/Source/core/css/CSSPrimitiveValueMappings.h b/Source/core/css/CSSPrimitiveValueMappings.h
index 17cc619cdc50e41c020b6c4af99a333d3aafa520..df8fde65c2aa4a0a507a6ecf4b2380c8c7da6e1e 100644
--- a/Source/core/css/CSSPrimitiveValueMappings.h
+++ b/Source/core/css/CSSPrimitiveValueMappings.h
@@ -117,11 +117,12 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineClampValue i)
template<> inline CSSPrimitiveValue::operator LineClampValue() const
{
- if (type() == CSS_NUMBER)
- return LineClampValue(clampTo<int>(value().num), LineClampLineCount);
+ UnitType unitType = type();
+ if (unitType == CSS_NUMBER)
+ return LineClampValue(clampTo<int>(numValue()), LineClampLineCount);
- if (type() == CSS_PERCENTAGE)
- return LineClampValue(clampTo<int>(value().num), LineClampPercentage);
+ if (unitType == CSS_PERCENTAGE)
+ return LineClampValue(clampTo<int>(numValue()), LineClampPercentage);
ASSERT_NOT_REACHED();
return LineClampValue();
@@ -149,7 +150,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CSSReflectionDirection e)
template<> inline CSSPrimitiveValue::operator CSSReflectionDirection() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAbove:
return ReflectionAbove;
case CSSValueBelow:
@@ -183,9 +184,10 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColumnFill columnFill)
template<> inline CSSPrimitiveValue::operator ColumnFill() const
{
if (type() == CSS_VALUE_ID) {
- if (value().valueID == CSSValueBalance)
+ CSSValueID valueID = valueIDValue();
+ if (valueID == CSSValueBalance)
return ColumnFillBalance;
- if (value().valueID == CSSValueAuto)
+ if (valueID == CSSValueAuto)
return ColumnFillAuto;
}
ASSERT_NOT_REACHED();
@@ -209,11 +211,11 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ColumnSpan columnSpan)
template<> inline CSSPrimitiveValue::operator ColumnSpan() const
{
// Map 1 to none for compatibility reasons.
- if (type() == CSS_NUMBER && value().num == 1)
+ if (type() == CSS_NUMBER && numValue() == 1)
return ColumnSpanNone;
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAll:
return ColumnSpanAll;
case CSSValueNone:
@@ -244,7 +246,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(PrintColorAdjust value)
template<> inline CSSPrimitiveValue::operator PrintColorAdjust() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueEconomy:
return PrintColorAdjustEconomy;
case CSSValueExact:
@@ -299,14 +301,14 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBorderStyle e)
template<> inline CSSPrimitiveValue::operator EBorderStyle() const
{
ASSERT(isValueID());
- if (value().valueID == CSSValueAuto) // Valid for CSS outline-style
+ if (valueIDValue() == CSSValueAuto) // Valid for CSS outline-style
return DOTTED;
- return (EBorderStyle)(value().valueID - CSSValueNone);
+ return (EBorderStyle)(valueIDValue() - CSSValueNone);
}
template<> inline CSSPrimitiveValue::operator OutlineIsAuto() const
{
- if (value().valueID == CSSValueAuto)
+ if (valueIDValue() == CSSValueAuto)
return AUTO_ON;
return AUTO_OFF;
}
@@ -361,7 +363,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(CompositeOperator e)
template<> inline CSSPrimitiveValue::operator CompositeOperator() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueClear:
return CompositeClear;
case CSSValueCopy:
@@ -561,9 +563,9 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ControlPart e)
template<> inline CSSPrimitiveValue::operator ControlPart() const
{
ASSERT(isValueID());
- if (value().valueID == CSSValueNone)
+ if (valueIDValue() == CSSValueNone)
return NoControlPart;
- return ControlPart(value().valueID - CSSValueCheckbox + 1);
+ return ControlPart(valueIDValue() - CSSValueCheckbox + 1);
}
template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBackfaceVisibility e)
@@ -583,7 +585,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBackfaceVisibility e)
template<> inline CSSPrimitiveValue::operator EBackfaceVisibility() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueVisible:
return BackfaceVisibilityVisible;
case CSSValueHidden:
@@ -617,7 +619,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFillAttachment e)
template<> inline CSSPrimitiveValue::operator EFillAttachment() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueScroll:
return ScrollBackgroundAttachment;
case CSSValueLocal:
@@ -655,7 +657,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFillBox e)
template<> inline CSSPrimitiveValue::operator EFillBox() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueBorder:
case CSSValueBorderBox:
return BorderFillBox;
@@ -699,7 +701,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFillRepeat e)
template<> inline CSSPrimitiveValue::operator EFillRepeat() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueRepeat:
return RepeatFill;
case CSSValueNoRepeat:
@@ -739,7 +741,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxPack e)
template<> inline CSSPrimitiveValue::operator EBoxPack() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueStart:
return Start;
case CSSValueEnd:
@@ -782,7 +784,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxAlignment e)
template<> inline CSSPrimitiveValue::operator EBoxAlignment() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueStretch:
return BSTRETCH;
case CSSValueStart:
@@ -818,7 +820,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxDecorationBreak e)
template<> inline CSSPrimitiveValue::operator EBoxDecorationBreak() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueSlice:
return DSLICE;
case CSSValueClone:
@@ -854,7 +856,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(BackgroundEdgeOrigin e)
template<> inline CSSPrimitiveValue::operator BackgroundEdgeOrigin() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueTop:
return TopEdge;
case CSSValueRight:
@@ -888,7 +890,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxSizing e)
template<> inline CSSPrimitiveValue::operator EBoxSizing() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueBorderBox:
return BORDER_BOX;
case CSSValueContentBox:
@@ -918,7 +920,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxDirection e)
template<> inline CSSPrimitiveValue::operator EBoxDirection() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNormal:
return BNORMAL;
case CSSValueReverse:
@@ -948,7 +950,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxLines e)
template<> inline CSSPrimitiveValue::operator EBoxLines() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueSingle:
return SINGLE;
case CSSValueMultiple:
@@ -978,7 +980,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBoxOrient e)
template<> inline CSSPrimitiveValue::operator EBoxOrient() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueHorizontal:
case CSSValueInlineAxis:
return HORIZONTAL;
@@ -1016,7 +1018,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ECaptionSide e)
template<> inline CSSPrimitiveValue::operator ECaptionSide() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueLeft:
return CAPLEFT;
case CSSValueRight:
@@ -1056,7 +1058,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EClear e)
template<> inline CSSPrimitiveValue::operator EClear() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNone:
return CNONE;
case CSSValueLeft:
@@ -1192,7 +1194,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ECursor e)
template<> inline CSSPrimitiveValue::operator ECursor() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueCopy:
return CURSOR_COPY;
case CSSValueWebkitZoomIn:
@@ -1202,7 +1204,7 @@ template<> inline CSSPrimitiveValue::operator ECursor() const
case CSSValueNone:
return CURSOR_NONE;
default:
- return static_cast<ECursor>(value().valueID - CSSValueAuto);
+ return static_cast<ECursor>(valueIDValue() - CSSValueAuto);
}
}
@@ -1280,15 +1282,15 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDisplay e)
template<> inline CSSPrimitiveValue::operator EDisplay() const
{
ASSERT(isValueID());
- if (value().valueID == CSSValueNone)
+ if (valueIDValue() == CSSValueNone)
return NONE;
- if (value().valueID == CSSValueWebkitFlex)
+ if (valueIDValue() == CSSValueWebkitFlex)
return FLEX;
- if (value().valueID == CSSValueWebkitInlineFlex)
+ if (valueIDValue() == CSSValueWebkitInlineFlex)
return INLINE_FLEX;
- EDisplay display = static_cast<EDisplay>(value().valueID - CSSValueInline);
+ EDisplay display = static_cast<EDisplay>(valueIDValue() - CSSValueInline);
ASSERT(display >= INLINE && display <= NONE);
return display;
}
@@ -1310,7 +1312,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EEmptyCell e)
template<> inline CSSPrimitiveValue::operator EEmptyCell() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueShow:
return SHOW;
case CSSValueHide:
@@ -1346,7 +1348,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFlexDirection e)
template<> inline CSSPrimitiveValue::operator EFlexDirection() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueRow:
return FlowRow;
case CSSValueRowReverse:
@@ -1383,7 +1385,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFlexWrap e)
template<> inline CSSPrimitiveValue::operator EFlexWrap() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNowrap:
return FlexNoWrap;
case CSSValueWrap:
@@ -1418,7 +1420,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EFloat e)
template<> inline CSSPrimitiveValue::operator EFloat() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueLeft:
return LeftFloat;
case CSSValueRight:
@@ -1459,7 +1461,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineBreak e)
template<> inline CSSPrimitiveValue::operator LineBreak() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return LineBreakAuto;
case CSSValueLoose:
@@ -1495,7 +1497,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EListStylePosition e)
template<> inline CSSPrimitiveValue::operator EListStylePosition() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueOutside:
return OUTSIDE;
case CSSValueInside:
@@ -1687,11 +1689,11 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EListStyleType e)
template<> inline CSSPrimitiveValue::operator EListStyleType() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNone:
return NoneListStyle;
default:
- return static_cast<EListStyleType>(value().valueID - CSSValueDisc);
+ return static_cast<EListStyleType>(valueIDValue() - CSSValueDisc);
}
}
@@ -1715,7 +1717,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EMarginCollapse e)
template<> inline CSSPrimitiveValue::operator EMarginCollapse() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueCollapse:
return MCOLLAPSE;
case CSSValueSeparate:
@@ -1762,7 +1764,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EOverflow e)
template<> inline CSSPrimitiveValue::operator EOverflow() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueVisible:
return OVISIBLE;
case CSSValueHidden:
@@ -1805,7 +1807,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EPageBreak e)
template<> inline CSSPrimitiveValue::operator EPageBreak() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return PBAUTO;
case CSSValueLeft:
@@ -1848,7 +1850,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EPosition e)
template<> inline CSSPrimitiveValue::operator EPosition() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueStatic:
return StaticPosition;
case CSSValueRelative:
@@ -1890,7 +1892,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EResize e)
template<> inline CSSPrimitiveValue::operator EResize() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueBoth:
return RESIZE_BOTH;
case CSSValueHorizontal:
@@ -1927,7 +1929,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETableLayout e)
template<> inline CSSPrimitiveValue::operator ETableLayout() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueFixed:
return TFIXED;
case CSSValueAuto:
@@ -1978,14 +1980,14 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextAlign e)
template<> inline CSSPrimitiveValue::operator ETextAlign() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueWebkitAuto: // Legacy -webkit-auto. Eqiuvalent to start.
case CSSValueStart:
return TASTART;
case CSSValueEnd:
return TAEND;
default:
- return static_cast<ETextAlign>(value().valueID - CSSValueLeft);
+ return static_cast<ETextAlign>(valueIDValue() - CSSValueLeft);
}
}
@@ -2021,7 +2023,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextAlignLast e)
template<> inline CSSPrimitiveValue::operator TextAlignLast() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return TextAlignLastAuto;
case CSSValueStart:
@@ -2066,7 +2068,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextJustify e)
template<> inline CSSPrimitiveValue::operator TextJustify() const
{
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return TextJustifyAuto;
case CSSValueNone:
@@ -2086,7 +2088,7 @@ template<> inline CSSPrimitiveValue::operator TextJustify() const
template<> inline CSSPrimitiveValue::operator TextDecoration() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNone:
return TextDecorationNone;
case CSSValueUnderline:
@@ -2108,7 +2110,7 @@ template<> inline CSSPrimitiveValue::operator TextDecoration() const
template<> inline CSSPrimitiveValue::operator TextDecorationStyle() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueSolid:
return TextDecorationStyleSolid;
case CSSValueDouble:
@@ -2146,7 +2148,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextUnderlinePosition e)
template<> inline CSSPrimitiveValue::operator TextUnderlinePosition() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return TextUnderlinePositionAuto;
case CSSValueUnder:
@@ -2184,7 +2186,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextSecurity e)
template<> inline CSSPrimitiveValue::operator ETextSecurity() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNone:
return TSNONE;
case CSSValueDisc:
@@ -2224,7 +2226,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextTransform e)
template<> inline CSSPrimitiveValue::operator ETextTransform() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueCapitalize:
return CAPITALIZE;
case CSSValueUppercase:
@@ -2270,7 +2272,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EUnicodeBidi e)
template<> inline CSSPrimitiveValue::operator EUnicodeBidi() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNormal:
return UBNormal;
case CSSValueEmbed:
@@ -2313,7 +2315,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EUserDrag e)
template<> inline CSSPrimitiveValue::operator EUserDrag() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return DRAG_AUTO;
case CSSValueNone:
@@ -2348,7 +2350,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EUserModify e)
template<> inline CSSPrimitiveValue::operator EUserModify() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueReadOnly:
return READ_ONLY;
case CSSValueReadWrite:
@@ -2383,7 +2385,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EUserSelect e)
template<> inline CSSPrimitiveValue::operator EUserSelect() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return SELECT_TEXT;
case CSSValueNone:
@@ -2440,7 +2442,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EVerticalAlign a)
template<> inline CSSPrimitiveValue::operator EVerticalAlign() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueTop:
return TOP;
case CSSValueBottom:
@@ -2487,7 +2489,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EVisibility e)
template<> inline CSSPrimitiveValue::operator EVisibility() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueHidden:
return HIDDEN;
case CSSValueVisible:
@@ -2531,7 +2533,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EWhiteSpace e)
template<> inline CSSPrimitiveValue::operator EWhiteSpace() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueWebkitNowrap:
return KHTML_NOWRAP;
case CSSValueNowrap:
@@ -2575,7 +2577,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EWordBreak e)
template<> inline CSSPrimitiveValue::operator EWordBreak() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueBreakAll:
return BreakAllWordBreak;
case CSSValueBreakWord:
@@ -2609,7 +2611,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EOverflowWrap e)
template<> inline CSSPrimitiveValue::operator EOverflowWrap() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueBreakWord:
return BreakOverflowWrap;
case CSSValueNormal:
@@ -2639,7 +2641,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextDirection e)
template<> inline CSSPrimitiveValue::operator TextDirection() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueLtr:
return LTR;
case CSSValueRtl:
@@ -2675,7 +2677,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WritingMode e)
template<> inline CSSPrimitiveValue::operator WritingMode() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueHorizontalTb:
return TopToBottomWritingMode;
case CSSValueVerticalRl:
@@ -2709,7 +2711,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextCombine e)
template<> inline CSSPrimitiveValue::operator TextCombine() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNone:
return TextCombineNone;
case CSSValueHorizontal:
@@ -2739,7 +2741,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(RubyPosition position)
template<> inline CSSPrimitiveValue::operator RubyPosition() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueBefore:
return RubyPositionBefore;
case CSSValueAfter:
@@ -2769,7 +2771,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextEmphasisPosition posi
template<> inline CSSPrimitiveValue::operator TextEmphasisPosition() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueOver:
return TextEmphasisPositionOver;
case CSSValueUnder:
@@ -2799,7 +2801,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextOverflow overflow)
template<> inline CSSPrimitiveValue::operator TextOverflow() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueClip:
return TextOverflowClip;
case CSSValueEllipsis:
@@ -2829,7 +2831,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextEmphasisFill fill)
template<> inline CSSPrimitiveValue::operator TextEmphasisFill() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueFilled:
return TextEmphasisFillFilled;
case CSSValueOpen:
@@ -2874,7 +2876,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextEmphasisMark mark)
template<> inline CSSPrimitiveValue::operator TextEmphasisMark() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNone:
return TextEmphasisMarkNone;
case CSSValueDot:
@@ -2918,7 +2920,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextOrientation e)
template<> inline CSSPrimitiveValue::operator TextOrientation() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueSideways:
return TextOrientationSideways;
case CSSValueSidewaysRight:
@@ -2979,7 +2981,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EPointerEvents e)
template<> inline CSSPrimitiveValue::operator EPointerEvents() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAll:
return PE_ALL;
case CSSValueAuto:
@@ -3033,7 +3035,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontDescription::Kerning
template<> inline CSSPrimitiveValue::operator FontDescription::Kerning() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return FontDescription::AutoKerning;
case CSSValueNormal:
@@ -3073,7 +3075,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ObjectFit fit)
template<> inline CSSPrimitiveValue::operator ObjectFit() const
{
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueFill:
return ObjectFitFill;
case CSSValueContain:
@@ -3136,7 +3138,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontSmoothingMode smoothi
template<> inline CSSPrimitiveValue::operator FontSmoothingMode() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return AutoSmoothing;
case CSSValueNone:
@@ -3194,7 +3196,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontWeight weight)
template<> inline CSSPrimitiveValue::operator FontWeight() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueBold:
return FontWeightBold;
case CSSValueNormal:
@@ -3245,7 +3247,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontStyle italic)
template<> inline CSSPrimitiveValue::operator FontStyle() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueOblique:
// FIXME: oblique is the same as italic for the moment...
case CSSValueItalic:
@@ -3300,7 +3302,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontStretch stretch)
template<> inline CSSPrimitiveValue::operator FontStretch() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueUltraCondensed:
return FontStretchUltraCondensed;
case CSSValueExtraCondensed:
@@ -3347,7 +3349,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(FontVariant smallCaps)
template<> inline CSSPrimitiveValue::operator FontVariant() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueSmallCaps:
return FontVariantSmallCaps;
case CSSValueNormal:
@@ -3382,7 +3384,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(TextRenderingMode e)
template<> inline CSSPrimitiveValue::operator TextRenderingMode() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return AutoTextRendering;
case CSSValueOptimizeSpeed:
@@ -3428,7 +3430,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ESpeak e)
template<> inline CSSPrimitiveValue::operator Order() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueLogical:
return LogicalOrder;
case CSSValueVisual:
@@ -3458,7 +3460,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(Order e)
template<> inline CSSPrimitiveValue::operator ESpeak() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNone:
return SpeakNone;
case CSSValueNormal:
@@ -3538,7 +3540,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WebBlendMode blendMode)
template<> inline CSSPrimitiveValue::operator WebBlendMode() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNormal:
return WebBlendModeNormal;
case CSSValueMultiply:
@@ -3599,7 +3601,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineCap e)
template<> inline CSSPrimitiveValue::operator LineCap() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueButt:
return ButtCap;
case CSSValueRound:
@@ -3634,7 +3636,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(LineJoin e)
template<> inline CSSPrimitiveValue::operator LineJoin() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueMiter:
return MiterJoin;
case CSSValueRound:
@@ -3666,7 +3668,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(WindRule e)
template<> inline CSSPrimitiveValue::operator WindRule() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNonzero:
return RULE_NONZERO;
case CSSValueEvenodd:
@@ -3727,7 +3729,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EAlignmentBaseline e)
template<> inline CSSPrimitiveValue::operator EAlignmentBaseline() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return AB_AUTO;
case CSSValueBaseline:
@@ -3777,7 +3779,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBorderCollapse e)
template<> inline CSSPrimitiveValue::operator EBorderCollapse() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueSeparate:
return BSEPARATE;
case CSSValueCollapse:
@@ -3816,7 +3818,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EImageRendering e)
template<> inline CSSPrimitiveValue::operator EImageRendering() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return ImageRenderingAuto;
case CSSValueOptimizeSpeed:
@@ -3852,7 +3854,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETransformStyle3D e)
template<> inline CSSPrimitiveValue::operator ETransformStyle3D() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueFlat:
return TransformStyle3DFlat;
case CSSValuePreserve3d:
@@ -3885,7 +3887,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EBufferedRendering e)
template<> inline CSSPrimitiveValue::operator EBufferedRendering() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return BR_AUTO;
case CSSValueDynamic:
@@ -3920,7 +3922,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EColorInterpolation e)
template<> inline CSSPrimitiveValue::operator EColorInterpolation() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueSRGB:
return CI_SRGB;
case CSSValueLinearRGB:
@@ -3955,7 +3957,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EColorRendering e)
template<> inline CSSPrimitiveValue::operator EColorRendering() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueOptimizeSpeed:
return CR_OPTIMIZESPEED;
case CSSValueOptimizeQuality:
@@ -4017,7 +4019,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDominantBaseline e)
template<> inline CSSPrimitiveValue::operator EDominantBaseline() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return DB_AUTO;
case CSSValueUseScript:
@@ -4073,7 +4075,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EShapeRendering e)
template<> inline CSSPrimitiveValue::operator EShapeRendering() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return SR_AUTO;
case CSSValueOptimizeSpeed:
@@ -4110,7 +4112,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ETextAnchor e)
template<> inline CSSPrimitiveValue::operator ETextAnchor() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueStart:
return TA_START;
case CSSValueMiddle:
@@ -4154,7 +4156,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(SVGWritingMode e)
template<> inline CSSPrimitiveValue::operator SVGWritingMode() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueLrTb:
return WM_LRTB;
case CSSValueLr:
@@ -4192,7 +4194,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EVectorEffect e)
template<> inline CSSPrimitiveValue::operator EVectorEffect() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNone:
return VE_NONE;
case CSSValueNonScalingStroke:
@@ -4229,7 +4231,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EPaintOrderType e)
template<> inline CSSPrimitiveValue::operator EPaintOrderType() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueFill:
return PT_FILL;
case CSSValueStroke:
@@ -4261,7 +4263,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EMaskType e)
template<> inline CSSPrimitiveValue::operator EMaskType() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueLuminance:
return MT_LUMINANCE;
case CSSValueAlpha:
@@ -4277,7 +4279,7 @@ template<> inline CSSPrimitiveValue::operator EMaskType() const
template<> inline CSSPrimitiveValue::operator TouchAction() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNone:
return TouchActionNone;
case CSSValueAuto:
@@ -4321,7 +4323,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i)
template<> inline CSSPrimitiveValue::operator EIsolation() const
{
ASSERT(isValueID());
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return IsolationAuto;
case CSSValueIsolate:
@@ -4336,7 +4338,7 @@ template<> inline CSSPrimitiveValue::operator EIsolation() const
template<> inline CSSPrimitiveValue::operator WebScrollBlocksOn() const
{
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueNone:
return WebScrollBlocksOnNone;
case CSSValueStartTouch:
@@ -4443,7 +4445,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ItemPosition itemPosition
template<> inline CSSPrimitiveValue::operator ItemPosition() const
{
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return ItemPositionAuto;
case CSSValueStretch:
@@ -4517,7 +4519,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ContentPosition contentPo
template<> inline CSSPrimitiveValue::operator ContentPosition() const
{
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueAuto:
return ContentPositionAuto;
case CSSValueBaseline:
@@ -4570,7 +4572,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ContentDistributionType c
template<> inline CSSPrimitiveValue::operator ContentDistributionType() const
{
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueSpaceBetween:
return ContentDistributionSpaceBetween;
case CSSValueSpaceAround:
@@ -4605,7 +4607,7 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(OverflowAlignment overflo
template<> inline CSSPrimitiveValue::operator OverflowAlignment() const
{
- switch (value().valueID) {
+ switch (valueIDValue()) {
case CSSValueTrue:
return OverflowAlignmentTrue;
case CSSValueSafe:
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698