OLD | NEW |
---|---|
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. (http://www.torchmo bile.com/) | 4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) |
5 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> | 5 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> |
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
7 * | 7 * |
8 * Redistribution and use in source and binary forms, with or without | 8 * Redistribution and use in source and binary forms, with or without |
9 * modification, are permitted provided that the following conditions | 9 * modification, are permitted provided that the following conditions |
10 * are met: | 10 * are met: |
(...skipping 1159 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1170 default: | 1170 default: |
1171 return static_cast<ECursor>(m_value.valueID - CSSValueAuto); | 1171 return static_cast<ECursor>(m_value.valueID - CSSValueAuto); |
1172 } | 1172 } |
1173 } | 1173 } |
1174 | 1174 |
1175 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDisplay e) | 1175 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDisplay e) |
1176 : CSSValue(PrimitiveClass) | 1176 : CSSValue(PrimitiveClass) |
1177 { | 1177 { |
1178 init(UnitType::ValueID); | 1178 init(UnitType::ValueID); |
1179 switch (e) { | 1179 switch (e) { |
1180 case INLINE: | 1180 case EDisplay::Inline: |
1181 m_value.valueID = CSSValueInline; | 1181 m_value.valueID = CSSValueInline; |
1182 break; | 1182 break; |
1183 case BLOCK: | 1183 case EDisplay::Block: |
1184 m_value.valueID = CSSValueBlock; | 1184 m_value.valueID = CSSValueBlock; |
1185 break; | 1185 break; |
1186 case LIST_ITEM: | 1186 case EDisplay::ListItem: |
1187 m_value.valueID = CSSValueListItem; | 1187 m_value.valueID = CSSValueListItem; |
1188 break; | 1188 break; |
1189 case INLINE_BLOCK: | 1189 case EDisplay::InlineBlock: |
1190 m_value.valueID = CSSValueInlineBlock; | 1190 m_value.valueID = CSSValueInlineBlock; |
1191 break; | 1191 break; |
1192 case TABLE: | 1192 case EDisplay::Table: |
1193 m_value.valueID = CSSValueTable; | 1193 m_value.valueID = CSSValueTable; |
1194 break; | 1194 break; |
1195 case INLINE_TABLE: | 1195 case EDisplay::InlineTable: |
1196 m_value.valueID = CSSValueInlineTable; | 1196 m_value.valueID = CSSValueInlineTable; |
1197 break; | 1197 break; |
1198 case TABLE_ROW_GROUP: | 1198 case EDisplay::TableRowGroup: |
1199 m_value.valueID = CSSValueTableRowGroup; | 1199 m_value.valueID = CSSValueTableRowGroup; |
1200 break; | 1200 break; |
1201 case TABLE_HEADER_GROUP: | 1201 case EDisplay::TableHeaderGroup: |
1202 m_value.valueID = CSSValueTableHeaderGroup; | 1202 m_value.valueID = CSSValueTableHeaderGroup; |
1203 break; | 1203 break; |
1204 case TABLE_FOOTER_GROUP: | 1204 case EDisplay::TableFooterGroup: |
1205 m_value.valueID = CSSValueTableFooterGroup; | 1205 m_value.valueID = CSSValueTableFooterGroup; |
1206 break; | 1206 break; |
1207 case TABLE_ROW: | 1207 case EDisplay::TableRow: |
1208 m_value.valueID = CSSValueTableRow; | 1208 m_value.valueID = CSSValueTableRow; |
1209 break; | 1209 break; |
1210 case TABLE_COLUMN_GROUP: | 1210 case EDisplay::TableColumnGroup: |
1211 m_value.valueID = CSSValueTableColumnGroup; | 1211 m_value.valueID = CSSValueTableColumnGroup; |
1212 break; | 1212 break; |
1213 case TABLE_COLUMN: | 1213 case EDisplay::TableColumn: |
1214 m_value.valueID = CSSValueTableColumn; | 1214 m_value.valueID = CSSValueTableColumn; |
1215 break; | 1215 break; |
1216 case TABLE_CELL: | 1216 case EDisplay::TableCell: |
1217 m_value.valueID = CSSValueTableCell; | 1217 m_value.valueID = CSSValueTableCell; |
1218 break; | 1218 break; |
1219 case TABLE_CAPTION: | 1219 case EDisplay::TableCaption: |
1220 m_value.valueID = CSSValueTableCaption; | 1220 m_value.valueID = CSSValueTableCaption; |
1221 break; | 1221 break; |
1222 case BOX: | 1222 case EDisplay::Box: |
1223 m_value.valueID = CSSValueWebkitBox; | 1223 m_value.valueID = CSSValueWebkitBox; |
1224 break; | 1224 break; |
1225 case INLINE_BOX: | 1225 case EDisplay::InlineBox: |
1226 m_value.valueID = CSSValueWebkitInlineBox; | 1226 m_value.valueID = CSSValueWebkitInlineBox; |
1227 break; | 1227 break; |
1228 case FLEX: | 1228 case EDisplay::Flex: |
1229 m_value.valueID = CSSValueFlex; | 1229 m_value.valueID = CSSValueFlex; |
1230 break; | 1230 break; |
1231 case INLINE_FLEX: | 1231 case EDisplay::InlineFlex: |
1232 m_value.valueID = CSSValueInlineFlex; | 1232 m_value.valueID = CSSValueInlineFlex; |
1233 break; | 1233 break; |
1234 case GRID: | 1234 case EDisplay::Grid: |
1235 m_value.valueID = CSSValueGrid; | 1235 m_value.valueID = CSSValueGrid; |
1236 break; | 1236 break; |
1237 case INLINE_GRID: | 1237 case EDisplay::InlineGrid: |
1238 m_value.valueID = CSSValueInlineGrid; | 1238 m_value.valueID = CSSValueInlineGrid; |
1239 break; | 1239 break; |
1240 case NONE: | 1240 case EDisplay::None: |
1241 m_value.valueID = CSSValueNone; | 1241 m_value.valueID = CSSValueNone; |
1242 break; | 1242 break; |
1243 } | 1243 } |
1244 } | 1244 } |
1245 | 1245 |
1246 template<> inline EDisplay CSSPrimitiveValue::convertTo() const | 1246 template<> inline EDisplay CSSPrimitiveValue::convertTo() const |
1247 { | 1247 { |
1248 ASSERT(isValueID()); | 1248 ASSERT(isValueID()); |
1249 if (m_value.valueID == CSSValueNone) | 1249 if (m_value.valueID == CSSValueNone) |
1250 return NONE; | 1250 return EDisplay::None; |
1251 | 1251 |
1252 if (m_value.valueID == CSSValueWebkitFlex) | 1252 if (m_value.valueID == CSSValueWebkitFlex) |
1253 return FLEX; | 1253 return EDisplay::Flex; |
1254 if (m_value.valueID == CSSValueWebkitInlineFlex) | 1254 if (m_value.valueID == CSSValueWebkitInlineFlex) |
1255 return INLINE_FLEX; | 1255 return EDisplay::InlineFlex; |
1256 | 1256 |
1257 EDisplay display = static_cast<EDisplay>(m_value.valueID - CSSValueInline); | 1257 EDisplay display = static_cast<EDisplay>(m_value.valueID - CSSValueInline); |
1258 ASSERT(display >= INLINE && display <= NONE); | 1258 // TODO(sashab): Check display is a valid EDisplay here. |
sashab
2016/09/26 03:49:51
There are a couple of options here. Do we want gen
alancutter (OOO until 2018)
2016/09/26 04:23:46
We should continue having this assertion, we are m
| |
1259 return display; | 1259 return display; |
1260 } | 1260 } |
1261 | 1261 |
1262 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EEmptyCells e) | 1262 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EEmptyCells e) |
1263 : CSSValue(PrimitiveClass) | 1263 : CSSValue(PrimitiveClass) |
1264 { | 1264 { |
1265 init(UnitType::ValueID); | 1265 init(UnitType::ValueID); |
1266 switch (e) { | 1266 switch (e) { |
1267 case EmptyCellsShow: | 1267 case EmptyCellsShow: |
1268 m_value.valueID = CSSValueShow; | 1268 m_value.valueID = CSSValueShow; |
(...skipping 3448 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4717 default: | 4717 default: |
4718 break; | 4718 break; |
4719 } | 4719 } |
4720 ASSERT_NOT_REACHED(); | 4720 ASSERT_NOT_REACHED(); |
4721 return ContainsNone; | 4721 return ContainsNone; |
4722 } | 4722 } |
4723 | 4723 |
4724 } // namespace blink | 4724 } // namespace blink |
4725 | 4725 |
4726 #endif | 4726 #endif |
OLD | NEW |