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 1224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1235 case TABLE_CAPTION: | 1235 case TABLE_CAPTION: |
1236 m_value.valueID = CSSValueTableCaption; | 1236 m_value.valueID = CSSValueTableCaption; |
1237 break; | 1237 break; |
1238 case BOX: | 1238 case BOX: |
1239 m_value.valueID = CSSValueWebkitBox; | 1239 m_value.valueID = CSSValueWebkitBox; |
1240 break; | 1240 break; |
1241 case INLINE_BOX: | 1241 case INLINE_BOX: |
1242 m_value.valueID = CSSValueWebkitInlineBox; | 1242 m_value.valueID = CSSValueWebkitInlineBox; |
1243 break; | 1243 break; |
1244 case FLEX: | 1244 case FLEX: |
1245 m_value.valueID = CSSValueWebkitFlex; | 1245 m_value.valueID = CSSValueFlex; |
1246 break; | 1246 break; |
1247 case INLINE_FLEX: | 1247 case INLINE_FLEX: |
1248 m_value.valueID = CSSValueWebkitInlineFlex; | 1248 m_value.valueID = CSSValueInlineFlex; |
1249 break; | 1249 break; |
1250 case GRID: | 1250 case GRID: |
1251 m_value.valueID = CSSValueGrid; | 1251 m_value.valueID = CSSValueGrid; |
1252 break; | 1252 break; |
1253 case INLINE_GRID: | 1253 case INLINE_GRID: |
1254 m_value.valueID = CSSValueInlineGrid; | 1254 m_value.valueID = CSSValueInlineGrid; |
1255 break; | 1255 break; |
1256 case LAZY_BLOCK: | 1256 case LAZY_BLOCK: |
1257 m_value.valueID = CSSValueLazyBlock; | 1257 m_value.valueID = CSSValueLazyBlock; |
1258 break; | 1258 break; |
1259 case NONE: | 1259 case NONE: |
1260 m_value.valueID = CSSValueNone; | 1260 m_value.valueID = CSSValueNone; |
1261 break; | 1261 break; |
1262 } | 1262 } |
1263 } | 1263 } |
1264 | 1264 |
1265 template<> inline CSSPrimitiveValue::operator EDisplay() const | 1265 template<> inline CSSPrimitiveValue::operator EDisplay() const |
1266 { | 1266 { |
1267 if (m_value.valueID == CSSValueNone) | 1267 if (m_value.valueID == CSSValueNone) |
1268 return NONE; | 1268 return NONE; |
1269 | 1269 |
| 1270 if (m_value.valueID == CSSValueWebkitFlex) |
| 1271 return FLEX; |
| 1272 if (m_value.valueID == CSSValueWebkitInlineFlex) |
| 1273 return INLINE_FLEX; |
| 1274 |
1270 EDisplay display = static_cast<EDisplay>(m_value.valueID - CSSValueInline); | 1275 EDisplay display = static_cast<EDisplay>(m_value.valueID - CSSValueInline); |
1271 ASSERT(display >= INLINE && display <= NONE); | 1276 ASSERT(display >= INLINE && display <= NONE); |
1272 return display; | 1277 return display; |
1273 } | 1278 } |
1274 | 1279 |
1275 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EEmptyCell e) | 1280 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EEmptyCell e) |
1276 : CSSValue(PrimitiveClass) | 1281 : CSSValue(PrimitiveClass) |
1277 { | 1282 { |
1278 m_primitiveUnitType = CSS_VALUE_ID; | 1283 m_primitiveUnitType = CSS_VALUE_ID; |
1279 switch (e) { | 1284 switch (e) { |
(...skipping 3397 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4677 break; | 4682 break; |
4678 } | 4683 } |
4679 | 4684 |
4680 ASSERT_NOT_REACHED(); | 4685 ASSERT_NOT_REACHED(); |
4681 return TouchActionNone; | 4686 return TouchActionNone; |
4682 } | 4687 } |
4683 | 4688 |
4684 } | 4689 } |
4685 | 4690 |
4686 #endif | 4691 #endif |
OLD | NEW |