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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2366243002: Remove all ordering requirements in CSSValueKeywords.in (WIP) (Closed)
Patch Set: Some mor efixes Created 4 years, 1 month 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 | « no previous file | third_party/WebKit/Source/core/css/CSSValueKeywords.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 4c4ea5e194977251a80079873e3a4cddb679a598..377f10949de2c1267035288b7ee076349967b909 100644
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
@@ -56,6 +56,12 @@
namespace blink {
+// TODO(sashab): Move these to a separate file, and generate them.
+template <typename T>
+inline CSSValueID platformEnumToCSSValueID(T);
+template <typename T>
+inline T CSSValueIDToPlatformEnum(CSSValueID);
+
// TODO(sashab): Move these to CSSPrimitiveValue.h.
template <>
inline short CSSPrimitiveValue::convertTo() const {
@@ -261,9 +267,34 @@ inline CSSIdentifierValue::CSSIdentifierValue(EBorderStyle e)
template <>
inline EBorderStyle CSSIdentifierValue::convertTo() const {
- if (m_valueID == CSSValueAuto) // Valid for CSS outline-style
- return BorderStyleDotted;
- return (EBorderStyle)(m_valueID - CSSValueNone);
+ switch (m_valueID) {
+ case CSSValueNone:
+ return BorderStyleNone;
+ case CSSValueHidden:
+ return BorderStyleHidden;
+ case CSSValueInset:
+ return BorderStyleInset;
+ case CSSValueGroove:
+ return BorderStyleGroove;
+ case CSSValueOutset:
+ return BorderStyleOutset;
+ case CSSValueRidge:
+ return BorderStyleRidge;
+ case CSSValueDotted:
+ case CSSValueAuto:
+ return BorderStyleDotted;
+ case CSSValueDashed:
+ return BorderStyleDashed;
+ case CSSValueSolid:
+ return BorderStyleSolid;
+ case CSSValueDouble:
+ return BorderStyleDouble;
+ default:
+ break;
+ }
+
+ NOTREACHED();
+ return BorderStyleNone;
}
template <>
@@ -516,9 +547,115 @@ inline CSSIdentifierValue::CSSIdentifierValue(ControlPart e)
template <>
inline ControlPart CSSIdentifierValue::convertTo() const {
- if (m_valueID == CSSValueNone)
- return NoControlPart;
- return ControlPart(m_valueID - CSSValueCheckbox + 1);
+ switch (m_valueID) {
+ case CSSValueNone:
+ return NoControlPart;
+ case CSSValueCheckbox:
+ return CheckboxPart;
+ case CSSValueRadio:
+ return RadioPart;
+ case CSSValuePushButton:
+ return PushButtonPart;
+ case CSSValueSquareButton:
+ return SquareButtonPart;
+ case CSSValueButton:
+ return ButtonPart;
+ case CSSValueButtonBevel:
+ return ButtonBevelPart;
+ case CSSValueInnerSpinButton:
+ return InnerSpinButtonPart;
+ case CSSValueListbox:
+ return ListboxPart;
+ case CSSValueListitem:
+ return ListItemPart;
+ case CSSValueMediaEnterFullscreenButton:
+ return MediaEnterFullscreenButtonPart;
+ case CSSValueMediaExitFullscreenButton:
+ return MediaExitFullscreenButtonPart;
+ case CSSValueMediaFullscreenVolumeSlider:
+ return MediaFullscreenVolumeSliderPart;
+ case CSSValueMediaFullscreenVolumeSliderThumb:
+ return MediaFullscreenVolumeSliderThumbPart;
+ case CSSValueMediaMuteButton:
+ return MediaMuteButtonPart;
+ case CSSValueMediaPlayButton:
+ return MediaPlayButtonPart;
+ case CSSValueMediaOverlayPlayButton:
+ return MediaOverlayPlayButtonPart;
+ case CSSValueMediaToggleClosedCaptionsButton:
+ return MediaToggleClosedCaptionsButtonPart;
+ case CSSValueMediaSlider:
+ return MediaSliderPart;
+ case CSSValueMediaSliderthumb:
+ return MediaSliderThumbPart;
+ case CSSValueMediaVolumeSliderContainer:
+ return MediaVolumeSliderContainerPart;
+ case CSSValueMediaVolumeSlider:
+ return MediaVolumeSliderPart;
+ case CSSValueMediaVolumeSliderthumb:
+ return MediaVolumeSliderThumbPart;
+ case CSSValueMediaControlsBackground:
+ return MediaControlsBackgroundPart;
+ case CSSValueMediaControlsFullscreenBackground:
+ return MediaControlsFullscreenBackgroundPart;
+ case CSSValueMediaCurrentTimeDisplay:
+ return MediaCurrentTimePart;
+ case CSSValueMediaTimeRemainingDisplay:
+ return MediaTimeRemainingPart;
+ case CSSValueInternalMediaCastOffButton:
+ return MediaCastOffButtonPart;
+ case CSSValueInternalMediaOverlayCastOffButton:
+ return MediaOverlayCastOffButtonPart;
+ case CSSValueInternalMediaTrackSelectionCheckmark:
+ return MediaTrackSelectionCheckmarkPart;
+ case CSSValueInternalMediaClosedCaptionsIcon:
+ return MediaClosedCaptionsIconPart;
+ case CSSValueInternalMediaSubtitlesIcon:
+ return MediaSubtitlesIconPart;
+ case CSSValueInternalMediaOverflowButton:
+ return MediaOverflowMenuButtonPart;
+ case CSSValueInternalMediaDownloadButton:
+ return MediaDownloadIconPart;
+ case CSSValueMenulist:
+ return MenulistPart;
+ case CSSValueMenulistButton:
+ return MenulistButtonPart;
+ case CSSValueMenulistText:
+ return MenulistTextPart;
+ case CSSValueMenulistTextfield:
+ return MenulistTextFieldPart;
+ case CSSValueMeter:
+ return MeterPart;
+ case CSSValueProgressBar:
+ return ProgressBarPart;
+ case CSSValueProgressBarValue:
+ return ProgressBarValuePart;
+ case CSSValueSliderHorizontal:
+ return SliderHorizontalPart;
+ case CSSValueSliderVertical:
+ return SliderVerticalPart;
+ case CSSValueSliderthumbHorizontal:
+ return SliderThumbHorizontalPart;
+ case CSSValueSliderthumbVertical:
+ return SliderThumbVerticalPart;
+ case CSSValueCaret:
+ return CaretPart;
+ case CSSValueSearchfield:
+ return SearchFieldPart;
+ case CSSValueSearchfieldCancelButton:
+ return SearchFieldCancelButtonPart;
+ case CSSValueTextfield:
+ return TextFieldPart;
+ case CSSValueTextarea:
+ return TextAreaPart;
+ case CSSValueCapsLockIndicator:
+ return CapsLockIndicatorPart;
+ default:
+ break;
+ }
+
+ NOTREACHED();
+ return NoControlPart;
}
template <>
@@ -1116,17 +1253,86 @@ inline CSSIdentifierValue::CSSIdentifierValue(ECursor e)
template <>
inline ECursor CSSIdentifierValue::convertTo() const {
switch (m_valueID) {
- case CSSValueCopy:
- return CURSOR_COPY;
+ case CSSValueAuto:
+ return CURSOR_AUTO;
+ case CSSValueCrosshair:
+ return CURSOR_CROSS;
+ case CSSValueDefault:
+ return CURSOR_DEFAULT;
+ case CSSValuePointer:
+ return CURSOR_POINTER;
+ case CSSValueMove:
+ return CURSOR_MOVE;
+ case CSSValueVerticalText:
+ return CURSOR_VERTICAL_TEXT;
+ case CSSValueCell:
+ return CURSOR_CELL;
+ case CSSValueContextMenu:
+ return CURSOR_CONTEXT_MENU;
+ case CSSValueAlias:
+ return CURSOR_ALIAS;
+ case CSSValueProgress:
+ return CURSOR_PROGRESS;
+ case CSSValueNoDrop:
+ return CURSOR_NO_DROP;
+ case CSSValueNotAllowed:
+ return CURSOR_NOT_ALLOWED;
+ case CSSValueZoomIn:
case CSSValueWebkitZoomIn:
return CURSOR_ZOOM_IN;
+ case CSSValueZoomOut:
case CSSValueWebkitZoomOut:
return CURSOR_ZOOM_OUT;
+ case CSSValueEResize:
+ return CURSOR_E_RESIZE;
+ case CSSValueNeResize:
+ return CURSOR_NE_RESIZE;
+ case CSSValueNwResize:
+ return CURSOR_NW_RESIZE;
+ case CSSValueNResize:
+ return CURSOR_N_RESIZE;
+ case CSSValueSeResize:
+ return CURSOR_SE_RESIZE;
+ case CSSValueSwResize:
+ return CURSOR_SW_RESIZE;
+ case CSSValueSResize:
+ return CURSOR_S_RESIZE;
+ case CSSValueWResize:
+ return CURSOR_W_RESIZE;
+ case CSSValueEwResize:
+ return CURSOR_EW_RESIZE;
+ case CSSValueNsResize:
+ return CURSOR_NS_RESIZE;
+ case CSSValueNeswResize:
+ return CURSOR_NESW_RESIZE;
+ case CSSValueNwseResize:
+ return CURSOR_NWSE_RESIZE;
+ case CSSValueColResize:
+ return CURSOR_COL_RESIZE;
+ case CSSValueRowResize:
+ return CURSOR_ROW_RESIZE;
+ case CSSValueText:
+ return CURSOR_TEXT;
+ case CSSValueWait:
+ return CURSOR_WAIT;
+ case CSSValueHelp:
+ return CURSOR_HELP;
+ case CSSValueAllScroll:
+ return CURSOR_ALL_SCROLL;
+ case CSSValueWebkitGrab:
+ return CURSOR_WEBKIT_GRAB;
+ case CSSValueWebkitGrabbing:
+ return CURSOR_WEBKIT_GRABBING;
+ case CSSValueCopy:
+ return CURSOR_COPY;
case CSSValueNone:
return CURSOR_NONE;
default:
- return static_cast<ECursor>(m_valueID - CSSValueAuto);
+ break;
}
+
+ NOTREACHED();
+ return CURSOR_AUTO;
}
template <>
@@ -1204,17 +1410,57 @@ inline CSSIdentifierValue::CSSIdentifierValue(EDisplay e)
template <>
inline EDisplay CSSIdentifierValue::convertTo() const {
- if (m_valueID == CSSValueNone)
- return EDisplay::None;
-
- if (m_valueID == CSSValueWebkitFlex)
- return EDisplay::Flex;
- if (m_valueID == CSSValueWebkitInlineFlex)
- return EDisplay::InlineFlex;
+ switch (m_valueID) {
+ case CSSValueInline:
+ return EDisplay::Inline;
+ case CSSValueBlock:
+ return EDisplay::Block;
+ case CSSValueListItem:
+ return EDisplay::ListItem;
+ case CSSValueInlineBlock:
+ return EDisplay::InlineBlock;
+ case CSSValueTable:
+ return EDisplay::Table;
+ case CSSValueInlineTable:
+ return EDisplay::InlineTable;
+ case CSSValueTableRowGroup:
+ return EDisplay::TableRowGroup;
+ case CSSValueTableHeaderGroup:
+ return EDisplay::TableHeaderGroup;
+ case CSSValueTableFooterGroup:
+ return EDisplay::TableFooterGroup;
+ case CSSValueTableRow:
+ return EDisplay::TableRow;
+ case CSSValueTableColumnGroup:
+ return EDisplay::TableColumnGroup;
+ case CSSValueTableColumn:
+ return EDisplay::TableColumn;
+ case CSSValueTableCell:
+ return EDisplay::TableCell;
+ case CSSValueTableCaption:
+ return EDisplay::TableCaption;
+ case CSSValueWebkitBox:
+ return EDisplay::Box;
+ case CSSValueWebkitInlineBox:
+ return EDisplay::InlineBox;
+ case CSSValueFlex:
+ case CSSValueWebkitFlex:
+ return EDisplay::Flex;
+ case CSSValueInlineFlex:
+ case CSSValueWebkitInlineFlex:
+ return EDisplay::InlineFlex;
+ case CSSValueGrid:
+ return EDisplay::Grid;
+ case CSSValueInlineGrid:
+ return EDisplay::InlineGrid;
+ case CSSValueNone:
+ return EDisplay::None;
+ default:
+ break;
+ }
- EDisplay display = static_cast<EDisplay>(m_valueID - CSSValueInline);
- // TODO(sashab): Check display is a valid EDisplay here.
- return display;
+ NOTREACHED();
+ return EDisplay::Inline;
}
template <>
@@ -1454,188 +1700,257 @@ inline EListStylePosition CSSIdentifierValue::convertTo() const {
}
template <>
-inline CSSIdentifierValue::CSSIdentifierValue(EListStyleType e)
- : CSSValue(IdentifierClass) {
+inline CSSValueID platformEnumToCSSValueID(EListStyleType e) {
switch (e) {
case ArabicIndic:
- m_valueID = CSSValueArabicIndic;
- break;
+ return CSSValueArabicIndic;
case Armenian:
- m_valueID = CSSValueArmenian;
- break;
+ return CSSValueArmenian;
case Bengali:
- m_valueID = CSSValueBengali;
- break;
+ return CSSValueBengali;
case Cambodian:
- m_valueID = CSSValueCambodian;
- break;
+ return CSSValueCambodian;
case Circle:
- m_valueID = CSSValueCircle;
- break;
+ return CSSValueCircle;
case CjkEarthlyBranch:
- m_valueID = CSSValueCjkEarthlyBranch;
- break;
+ return CSSValueCjkEarthlyBranch;
case CjkHeavenlyStem:
- m_valueID = CSSValueCjkHeavenlyStem;
- break;
+ return CSSValueCjkHeavenlyStem;
case CJKIdeographic:
- m_valueID = CSSValueCjkIdeographic;
- break;
+ return CSSValueCjkIdeographic;
case DecimalLeadingZero:
- m_valueID = CSSValueDecimalLeadingZero;
- break;
+ return CSSValueDecimalLeadingZero;
case DecimalListStyle:
- m_valueID = CSSValueDecimal;
- break;
+ return CSSValueDecimal;
case Devanagari:
- m_valueID = CSSValueDevanagari;
- break;
+ return CSSValueDevanagari;
case Disc:
- m_valueID = CSSValueDisc;
- break;
+ return CSSValueDisc;
case EthiopicHalehame:
- m_valueID = CSSValueEthiopicHalehame;
- break;
+ return CSSValueEthiopicHalehame;
case EthiopicHalehameAm:
- m_valueID = CSSValueEthiopicHalehameAm;
- break;
+ return CSSValueEthiopicHalehameAm;
case EthiopicHalehameTiEt:
- m_valueID = CSSValueEthiopicHalehameTiEt;
- break;
+ return CSSValueEthiopicHalehameTiEt;
case EthiopicHalehameTiEr:
- m_valueID = CSSValueEthiopicHalehameTiEr;
- break;
+ return CSSValueEthiopicHalehameTiEr;
case Georgian:
- m_valueID = CSSValueGeorgian;
- break;
+ return CSSValueGeorgian;
case Gujarati:
- m_valueID = CSSValueGujarati;
- break;
+ return CSSValueGujarati;
case Gurmukhi:
- m_valueID = CSSValueGurmukhi;
- break;
+ return CSSValueGurmukhi;
case Hangul:
- m_valueID = CSSValueHangul;
- break;
+ return CSSValueHangul;
case HangulConsonant:
- m_valueID = CSSValueHangulConsonant;
- break;
+ return CSSValueHangulConsonant;
case KoreanHangulFormal:
- m_valueID = CSSValueKoreanHangulFormal;
- break;
+ return CSSValueKoreanHangulFormal;
case KoreanHanjaFormal:
- m_valueID = CSSValueKoreanHanjaFormal;
- break;
+ return CSSValueKoreanHanjaFormal;
case KoreanHanjaInformal:
- m_valueID = CSSValueKoreanHanjaInformal;
- break;
+ return CSSValueKoreanHanjaInformal;
case Hebrew:
- m_valueID = CSSValueHebrew;
- break;
+ return CSSValueHebrew;
case Hiragana:
- m_valueID = CSSValueHiragana;
- break;
+ return CSSValueHiragana;
case HiraganaIroha:
- m_valueID = CSSValueHiraganaIroha;
- break;
+ return CSSValueHiraganaIroha;
case Kannada:
- m_valueID = CSSValueKannada;
- break;
+ return CSSValueKannada;
case Katakana:
- m_valueID = CSSValueKatakana;
- break;
+ return CSSValueKatakana;
case KatakanaIroha:
- m_valueID = CSSValueKatakanaIroha;
- break;
+ return CSSValueKatakanaIroha;
case Khmer:
- m_valueID = CSSValueKhmer;
- break;
+ return CSSValueKhmer;
case Lao:
- m_valueID = CSSValueLao;
- break;
+ return CSSValueLao;
case LowerAlpha:
- m_valueID = CSSValueLowerAlpha;
- break;
+ return CSSValueLowerAlpha;
case LowerArmenian:
- m_valueID = CSSValueLowerArmenian;
- break;
+ return CSSValueLowerArmenian;
case LowerGreek:
- m_valueID = CSSValueLowerGreek;
- break;
+ return CSSValueLowerGreek;
case LowerLatin:
- m_valueID = CSSValueLowerLatin;
- break;
+ return CSSValueLowerLatin;
case LowerRoman:
- m_valueID = CSSValueLowerRoman;
- break;
+ return CSSValueLowerRoman;
case Malayalam:
- m_valueID = CSSValueMalayalam;
- break;
+ return CSSValueMalayalam;
case Mongolian:
- m_valueID = CSSValueMongolian;
- break;
+ return CSSValueMongolian;
case Myanmar:
- m_valueID = CSSValueMyanmar;
- break;
+ return CSSValueMyanmar;
case NoneListStyle:
- m_valueID = CSSValueNone;
- break;
+ return CSSValueNone;
case Oriya:
- m_valueID = CSSValueOriya;
- break;
+ return CSSValueOriya;
case Persian:
- m_valueID = CSSValuePersian;
- break;
+ return CSSValuePersian;
case SimpChineseFormal:
- m_valueID = CSSValueSimpChineseFormal;
- break;
+ return CSSValueSimpChineseFormal;
case SimpChineseInformal:
- m_valueID = CSSValueSimpChineseInformal;
- break;
+ return CSSValueSimpChineseInformal;
case Square:
- m_valueID = CSSValueSquare;
- break;
+ return CSSValueSquare;
case Telugu:
- m_valueID = CSSValueTelugu;
- break;
+ return CSSValueTelugu;
case Thai:
- m_valueID = CSSValueThai;
- break;
+ return CSSValueThai;
case Tibetan:
- m_valueID = CSSValueTibetan;
- break;
+ return CSSValueTibetan;
case TradChineseFormal:
- m_valueID = CSSValueTradChineseFormal;
- break;
+ return CSSValueTradChineseFormal;
case TradChineseInformal:
- m_valueID = CSSValueTradChineseInformal;
- break;
+ return CSSValueTradChineseInformal;
case UpperAlpha:
- m_valueID = CSSValueUpperAlpha;
- break;
+ return CSSValueUpperAlpha;
case UpperArmenian:
- m_valueID = CSSValueUpperArmenian;
- break;
+ return CSSValueUpperArmenian;
case UpperLatin:
- m_valueID = CSSValueUpperLatin;
- break;
+ return CSSValueUpperLatin;
case UpperRoman:
- m_valueID = CSSValueUpperRoman;
- break;
+ return CSSValueUpperRoman;
case Urdu:
- m_valueID = CSSValueUrdu;
- break;
+ return CSSValueUrdu;
}
+ NOTREACHED();
+ return CSSValueNone;
}
template <>
-inline EListStyleType CSSIdentifierValue::convertTo() const {
- switch (m_valueID) {
+inline EListStyleType CSSValueIDToPlatformEnum(CSSValueID id) {
+ switch (id) {
+ case CSSValueDisc:
+ return Disc;
+ case CSSValueCircle:
+ return Circle;
+ case CSSValueSquare:
+ return Square;
+ case CSSValueDecimal:
+ return DecimalListStyle;
+ case CSSValueDecimalLeadingZero:
+ return DecimalLeadingZero;
+ case CSSValueArabicIndic:
+ return ArabicIndic;
+ case CSSValueBengali:
+ return Bengali;
+ case CSSValueCambodian:
+ return Cambodian;
+ case CSSValueKhmer:
+ return Khmer;
+ case CSSValueDevanagari:
+ return Devanagari;
+ case CSSValueGujarati:
+ return Gujarati;
+ case CSSValueGurmukhi:
+ return Gurmukhi;
+ case CSSValueKannada:
+ return Kannada;
+ case CSSValueLao:
+ return Lao;
+ case CSSValueMalayalam:
+ return Malayalam;
+ case CSSValueMongolian:
+ return Mongolian;
+ case CSSValueMyanmar:
+ return Myanmar;
+ case CSSValueOriya:
+ return Oriya;
+ case CSSValuePersian:
+ return Persian;
+ case CSSValueUrdu:
+ return Urdu;
+ case CSSValueTelugu:
+ return Telugu;
+ case CSSValueTibetan:
+ return Tibetan;
+ case CSSValueThai:
+ return Thai;
+ case CSSValueLowerRoman:
+ return LowerRoman;
+ case CSSValueUpperRoman:
+ return UpperRoman;
+ case CSSValueLowerGreek:
+ return LowerGreek;
+ case CSSValueLowerAlpha:
+ return LowerAlpha;
+ case CSSValueLowerLatin:
+ return LowerLatin;
+ case CSSValueUpperAlpha:
+ return UpperAlpha;
+ case CSSValueUpperLatin:
+ return UpperLatin;
+ case CSSValueCjkEarthlyBranch:
+ return CjkEarthlyBranch;
+ case CSSValueCjkHeavenlyStem:
+ return CjkHeavenlyStem;
+ case CSSValueEthiopicHalehame:
+ return EthiopicHalehame;
+ case CSSValueEthiopicHalehameAm:
+ return EthiopicHalehameAm;
+ case CSSValueEthiopicHalehameTiEr:
+ return EthiopicHalehameTiEr;
+ case CSSValueEthiopicHalehameTiEt:
+ return EthiopicHalehameTiEt;
+ case CSSValueHangul:
+ return Hangul;
+ case CSSValueHangulConsonant:
+ return HangulConsonant;
+ case CSSValueKoreanHangulFormal:
+ return KoreanHangulFormal;
+ case CSSValueKoreanHanjaFormal:
+ return KoreanHanjaFormal;
+ case CSSValueKoreanHanjaInformal:
+ return KoreanHanjaInformal;
+ case CSSValueHebrew:
+ return Hebrew;
+ case CSSValueArmenian:
+ return Armenian;
+ case CSSValueLowerArmenian:
+ return LowerArmenian;
+ case CSSValueUpperArmenian:
+ return UpperArmenian;
+ case CSSValueGeorgian:
+ return Georgian;
+ case CSSValueCjkIdeographic:
+ return CJKIdeographic;
+ case CSSValueSimpChineseFormal:
+ return SimpChineseFormal;
+ case CSSValueSimpChineseInformal:
+ return SimpChineseInformal;
+ case CSSValueTradChineseFormal:
+ return TradChineseFormal;
+ case CSSValueTradChineseInformal:
+ return TradChineseInformal;
+ case CSSValueHiragana:
+ return Hiragana;
+ case CSSValueKatakana:
+ return Katakana;
+ case CSSValueHiraganaIroha:
+ return HiraganaIroha;
+ case CSSValueKatakanaIroha:
+ return KatakanaIroha;
case CSSValueNone:
return NoneListStyle;
default:
- return static_cast<EListStyleType>(m_valueID - CSSValueDisc);
+ break;
}
+
+ NOTREACHED();
+ return NoneListStyle;
+}
+
+template <>
+inline CSSIdentifierValue::CSSIdentifierValue(EListStyleType e)
+ : CSSValue(IdentifierClass) {
+ m_valueID = platformEnumToCSSValueID(e);
+}
+
+template <>
+inline EListStyleType CSSIdentifierValue::convertTo() const {
+ return CSSValueIDToPlatformEnum<EListStyleType>(m_valueID);
}
template <>
@@ -1946,16 +2261,32 @@ inline CSSIdentifierValue::CSSIdentifierValue(ETextAlign e)
template <>
inline ETextAlign CSSIdentifierValue::convertTo() const {
switch (m_valueID) {
+ case CSSValueLeft:
+ return LEFT;
+ case CSSValueRight:
+ return RIGHT;
+ case CSSValueCenter:
+ case CSSValueInternalCenter:
+ return CENTER;
+ case CSSValueJustify:
+ return JUSTIFY;
+ case CSSValueWebkitLeft:
+ return WEBKIT_LEFT;
+ case CSSValueWebkitRight:
+ return WEBKIT_RIGHT;
+ case CSSValueWebkitCenter:
+ return WEBKIT_CENTER;
case CSSValueWebkitAuto: // Legacy -webkit-auto. Eqiuvalent to start.
case CSSValueStart:
return TASTART;
case CSSValueEnd:
return TAEND;
- case CSSValueInternalCenter:
- return CENTER;
default:
- return static_cast<ETextAlign>(m_valueID - CSSValueLeft);
+ break;
}
+
+ NOTREACHED();
+ return LEFT;
}
template <>
« no previous file with comments | « no previous file | third_party/WebKit/Source/core/css/CSSValueKeywords.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698