| 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 1255 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1266 break; | 1266 break; |
| 1267 case INLINE_FLEX: | 1267 case INLINE_FLEX: |
| 1268 m_value.valueID = CSSValueInlineFlex; | 1268 m_value.valueID = CSSValueInlineFlex; |
| 1269 break; | 1269 break; |
| 1270 case GRID: | 1270 case GRID: |
| 1271 m_value.valueID = CSSValueGrid; | 1271 m_value.valueID = CSSValueGrid; |
| 1272 break; | 1272 break; |
| 1273 case INLINE_GRID: | 1273 case INLINE_GRID: |
| 1274 m_value.valueID = CSSValueInlineGrid; | 1274 m_value.valueID = CSSValueInlineGrid; |
| 1275 break; | 1275 break; |
| 1276 case LAZY_BLOCK: | |
| 1277 m_value.valueID = CSSValueLazyBlock; | |
| 1278 break; | |
| 1279 case NONE: | 1276 case NONE: |
| 1280 m_value.valueID = CSSValueNone; | 1277 m_value.valueID = CSSValueNone; |
| 1281 break; | 1278 break; |
| 1282 } | 1279 } |
| 1283 } | 1280 } |
| 1284 | 1281 |
| 1285 template<> inline CSSPrimitiveValue::operator EDisplay() const | 1282 template<> inline CSSPrimitiveValue::operator EDisplay() const |
| 1286 { | 1283 { |
| 1287 ASSERT(isValueID()); | 1284 ASSERT(isValueID()); |
| 1288 if (m_value.valueID == CSSValueNone) | 1285 if (m_value.valueID == CSSValueNone) |
| (...skipping 3455 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4744 break; | 4741 break; |
| 4745 } | 4742 } |
| 4746 | 4743 |
| 4747 ASSERT_NOT_REACHED(); | 4744 ASSERT_NOT_REACHED(); |
| 4748 return TouchActionNone; | 4745 return TouchActionNone; |
| 4749 } | 4746 } |
| 4750 | 4747 |
| 4751 } | 4748 } |
| 4752 | 4749 |
| 4753 #endif | 4750 #endif |
| OLD | NEW |