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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h

Issue 2670643004: Rename EDisplay values with k prefix. (Closed)
Patch Set: Rebase 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>. 2 * Copyright (C) 2007 Alexey Proskuryakov <ap@nypop.com>.
3 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. 4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
5 * (http://www.torchmobile.com/) 5 * (http://www.torchmobile.com/)
6 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> 6 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
(...skipping 1048 matching lines...) Expand 10 before | Expand all | Expand 10 after
1059 default: 1059 default:
1060 NOTREACHED(); 1060 NOTREACHED();
1061 return ECursor::kAuto; 1061 return ECursor::kAuto;
1062 } 1062 }
1063 } 1063 }
1064 1064
1065 template <> 1065 template <>
1066 inline CSSIdentifierValue::CSSIdentifierValue(EDisplay e) 1066 inline CSSIdentifierValue::CSSIdentifierValue(EDisplay e)
1067 : CSSValue(IdentifierClass) { 1067 : CSSValue(IdentifierClass) {
1068 switch (e) { 1068 switch (e) {
1069 case EDisplay::Inline: 1069 case EDisplay::kInline:
1070 m_valueID = CSSValueInline; 1070 m_valueID = CSSValueInline;
1071 break; 1071 break;
1072 case EDisplay::Block: 1072 case EDisplay::kBlock:
1073 m_valueID = CSSValueBlock; 1073 m_valueID = CSSValueBlock;
1074 break; 1074 break;
1075 case EDisplay::ListItem: 1075 case EDisplay::kListItem:
1076 m_valueID = CSSValueListItem; 1076 m_valueID = CSSValueListItem;
1077 break; 1077 break;
1078 case EDisplay::InlineBlock: 1078 case EDisplay::kInlineBlock:
1079 m_valueID = CSSValueInlineBlock; 1079 m_valueID = CSSValueInlineBlock;
1080 break; 1080 break;
1081 case EDisplay::Table: 1081 case EDisplay::kTable:
1082 m_valueID = CSSValueTable; 1082 m_valueID = CSSValueTable;
1083 break; 1083 break;
1084 case EDisplay::InlineTable: 1084 case EDisplay::kInlineTable:
1085 m_valueID = CSSValueInlineTable; 1085 m_valueID = CSSValueInlineTable;
1086 break; 1086 break;
1087 case EDisplay::TableRowGroup: 1087 case EDisplay::kTableRowGroup:
1088 m_valueID = CSSValueTableRowGroup; 1088 m_valueID = CSSValueTableRowGroup;
1089 break; 1089 break;
1090 case EDisplay::TableHeaderGroup: 1090 case EDisplay::kTableHeaderGroup:
1091 m_valueID = CSSValueTableHeaderGroup; 1091 m_valueID = CSSValueTableHeaderGroup;
1092 break; 1092 break;
1093 case EDisplay::TableFooterGroup: 1093 case EDisplay::kTableFooterGroup:
1094 m_valueID = CSSValueTableFooterGroup; 1094 m_valueID = CSSValueTableFooterGroup;
1095 break; 1095 break;
1096 case EDisplay::TableRow: 1096 case EDisplay::kTableRow:
1097 m_valueID = CSSValueTableRow; 1097 m_valueID = CSSValueTableRow;
1098 break; 1098 break;
1099 case EDisplay::TableColumnGroup: 1099 case EDisplay::kTableColumnGroup:
1100 m_valueID = CSSValueTableColumnGroup; 1100 m_valueID = CSSValueTableColumnGroup;
1101 break; 1101 break;
1102 case EDisplay::TableColumn: 1102 case EDisplay::kTableColumn:
1103 m_valueID = CSSValueTableColumn; 1103 m_valueID = CSSValueTableColumn;
1104 break; 1104 break;
1105 case EDisplay::TableCell: 1105 case EDisplay::kTableCell:
1106 m_valueID = CSSValueTableCell; 1106 m_valueID = CSSValueTableCell;
1107 break; 1107 break;
1108 case EDisplay::TableCaption: 1108 case EDisplay::kTableCaption:
1109 m_valueID = CSSValueTableCaption; 1109 m_valueID = CSSValueTableCaption;
1110 break; 1110 break;
1111 case EDisplay::WebkitBox: 1111 case EDisplay::kWebkitBox:
1112 m_valueID = CSSValueWebkitBox; 1112 m_valueID = CSSValueWebkitBox;
1113 break; 1113 break;
1114 case EDisplay::WebkitInlineBox: 1114 case EDisplay::kWebkitInlineBox:
1115 m_valueID = CSSValueWebkitInlineBox; 1115 m_valueID = CSSValueWebkitInlineBox;
1116 break; 1116 break;
1117 case EDisplay::Flex: 1117 case EDisplay::kFlex:
1118 m_valueID = CSSValueFlex; 1118 m_valueID = CSSValueFlex;
1119 break; 1119 break;
1120 case EDisplay::InlineFlex: 1120 case EDisplay::kInlineFlex:
1121 m_valueID = CSSValueInlineFlex; 1121 m_valueID = CSSValueInlineFlex;
1122 break; 1122 break;
1123 case EDisplay::Grid: 1123 case EDisplay::kGrid:
1124 m_valueID = CSSValueGrid; 1124 m_valueID = CSSValueGrid;
1125 break; 1125 break;
1126 case EDisplay::InlineGrid: 1126 case EDisplay::kInlineGrid:
1127 m_valueID = CSSValueInlineGrid; 1127 m_valueID = CSSValueInlineGrid;
1128 break; 1128 break;
1129 case EDisplay::Contents: 1129 case EDisplay::kContents:
1130 m_valueID = CSSValueContents; 1130 m_valueID = CSSValueContents;
1131 break; 1131 break;
1132 case EDisplay::FlowRoot: 1132 case EDisplay::kFlowRoot:
1133 m_valueID = CSSValueFlowRoot; 1133 m_valueID = CSSValueFlowRoot;
1134 break; 1134 break;
1135 case EDisplay::None: 1135 case EDisplay::kNone:
1136 m_valueID = CSSValueNone; 1136 m_valueID = CSSValueNone;
1137 break; 1137 break;
1138 } 1138 }
1139 } 1139 }
1140 1140
1141 template <> 1141 template <>
1142 inline EDisplay CSSIdentifierValue::convertTo() const { 1142 inline EDisplay CSSIdentifierValue::convertTo() const {
1143 switch (m_valueID) { 1143 switch (m_valueID) {
1144 case CSSValueInline: 1144 case CSSValueInline:
1145 return EDisplay::Inline; 1145 return EDisplay::kInline;
1146 case CSSValueBlock: 1146 case CSSValueBlock:
1147 return EDisplay::Block; 1147 return EDisplay::kBlock;
1148 case CSSValueListItem: 1148 case CSSValueListItem:
1149 return EDisplay::ListItem; 1149 return EDisplay::kListItem;
1150 case CSSValueInlineBlock: 1150 case CSSValueInlineBlock:
1151 return EDisplay::InlineBlock; 1151 return EDisplay::kInlineBlock;
1152 case CSSValueTable: 1152 case CSSValueTable:
1153 return EDisplay::Table; 1153 return EDisplay::kTable;
1154 case CSSValueInlineTable: 1154 case CSSValueInlineTable:
1155 return EDisplay::InlineTable; 1155 return EDisplay::kInlineTable;
1156 case CSSValueTableRowGroup: 1156 case CSSValueTableRowGroup:
1157 return EDisplay::TableRowGroup; 1157 return EDisplay::kTableRowGroup;
1158 case CSSValueTableHeaderGroup: 1158 case CSSValueTableHeaderGroup:
1159 return EDisplay::TableHeaderGroup; 1159 return EDisplay::kTableHeaderGroup;
1160 case CSSValueTableFooterGroup: 1160 case CSSValueTableFooterGroup:
1161 return EDisplay::TableFooterGroup; 1161 return EDisplay::kTableFooterGroup;
1162 case CSSValueTableRow: 1162 case CSSValueTableRow:
1163 return EDisplay::TableRow; 1163 return EDisplay::kTableRow;
1164 case CSSValueTableColumnGroup: 1164 case CSSValueTableColumnGroup:
1165 return EDisplay::TableColumnGroup; 1165 return EDisplay::kTableColumnGroup;
1166 case CSSValueTableColumn: 1166 case CSSValueTableColumn:
1167 return EDisplay::TableColumn; 1167 return EDisplay::kTableColumn;
1168 case CSSValueTableCell: 1168 case CSSValueTableCell:
1169 return EDisplay::TableCell; 1169 return EDisplay::kTableCell;
1170 case CSSValueTableCaption: 1170 case CSSValueTableCaption:
1171 return EDisplay::TableCaption; 1171 return EDisplay::kTableCaption;
1172 case CSSValueWebkitBox: 1172 case CSSValueWebkitBox:
1173 return EDisplay::WebkitBox; 1173 return EDisplay::kWebkitBox;
1174 case CSSValueWebkitInlineBox: 1174 case CSSValueWebkitInlineBox:
1175 return EDisplay::WebkitInlineBox; 1175 return EDisplay::kWebkitInlineBox;
1176 case CSSValueFlex: 1176 case CSSValueFlex:
1177 case CSSValueWebkitFlex: 1177 case CSSValueWebkitFlex:
1178 return EDisplay::Flex; 1178 return EDisplay::kFlex;
1179 case CSSValueInlineFlex: 1179 case CSSValueInlineFlex:
1180 case CSSValueWebkitInlineFlex: 1180 case CSSValueWebkitInlineFlex:
1181 return EDisplay::InlineFlex; 1181 return EDisplay::kInlineFlex;
1182 case CSSValueGrid: 1182 case CSSValueGrid:
1183 return EDisplay::Grid; 1183 return EDisplay::kGrid;
1184 case CSSValueInlineGrid: 1184 case CSSValueInlineGrid:
1185 return EDisplay::InlineGrid; 1185 return EDisplay::kInlineGrid;
1186 case CSSValueContents: 1186 case CSSValueContents:
1187 return EDisplay::Contents; 1187 return EDisplay::kContents;
1188 case CSSValueFlowRoot: 1188 case CSSValueFlowRoot:
1189 return EDisplay::FlowRoot; 1189 return EDisplay::kFlowRoot;
1190 case CSSValueNone: 1190 case CSSValueNone:
1191 return EDisplay::None; 1191 return EDisplay::kNone;
1192 break; 1192 break;
1193 default: 1193 default:
1194 NOTREACHED(); 1194 NOTREACHED();
1195 return EDisplay::None; 1195 return EDisplay::kNone;
1196 } 1196 }
1197 } 1197 }
1198 1198
1199 template <> 1199 template <>
1200 inline CSSIdentifierValue::CSSIdentifierValue(EFlexDirection e) 1200 inline CSSIdentifierValue::CSSIdentifierValue(EFlexDirection e)
1201 : CSSValue(IdentifierClass) { 1201 : CSSValue(IdentifierClass) {
1202 switch (e) { 1202 switch (e) {
1203 case FlowRow: 1203 case FlowRow:
1204 m_valueID = CSSValueRow; 1204 m_valueID = CSSValueRow;
1205 break; 1205 break;
(...skipping 2537 matching lines...) Expand 10 before | Expand all | Expand 10 after
3743 default: 3743 default:
3744 break; 3744 break;
3745 } 3745 }
3746 ASSERT_NOT_REACHED(); 3746 ASSERT_NOT_REACHED();
3747 return ContainsNone; 3747 return ContainsNone;
3748 } 3748 }
3749 3749
3750 } // namespace blink 3750 } // namespace blink
3751 3751
3752 #endif 3752 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698