| 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 960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 971 break; | 971 break; |
| 972 case INLINE_BLOCK: | 972 case INLINE_BLOCK: |
| 973 m_value.valueID = CSSValueInlineBlock; | 973 m_value.valueID = CSSValueInlineBlock; |
| 974 break; | 974 break; |
| 975 case FLEX: | 975 case FLEX: |
| 976 m_value.valueID = CSSValueFlex; | 976 m_value.valueID = CSSValueFlex; |
| 977 break; | 977 break; |
| 978 case INLINE_FLEX: | 978 case INLINE_FLEX: |
| 979 m_value.valueID = CSSValueInlineFlex; | 979 m_value.valueID = CSSValueInlineFlex; |
| 980 break; | 980 break; |
| 981 case GRID: | |
| 982 m_value.valueID = CSSValueGrid; | |
| 983 break; | |
| 984 case INLINE_GRID: | |
| 985 m_value.valueID = CSSValueInlineGrid; | |
| 986 break; | |
| 987 case NONE: | 981 case NONE: |
| 988 m_value.valueID = CSSValueNone; | 982 m_value.valueID = CSSValueNone; |
| 989 break; | 983 break; |
| 990 } | 984 } |
| 991 } | 985 } |
| 992 | 986 |
| 993 template<> inline CSSPrimitiveValue::operator EDisplay() const | 987 template<> inline CSSPrimitiveValue::operator EDisplay() const |
| 994 { | 988 { |
| 995 ASSERT(isValueID()); | 989 ASSERT(isValueID()); |
| 996 if (m_value.valueID == CSSValueNone) | 990 if (m_value.valueID == CSSValueNone) |
| 997 return NONE; | 991 return NONE; |
| 998 | 992 |
| 999 if (m_value.valueID == CSSValueWebkitFlex) | |
| 1000 return FLEX; | |
| 1001 if (m_value.valueID == CSSValueWebkitInlineFlex) | |
| 1002 return INLINE_FLEX; | |
| 1003 | |
| 1004 EDisplay display = static_cast<EDisplay>(m_value.valueID - CSSValueInline); | 993 EDisplay display = static_cast<EDisplay>(m_value.valueID - CSSValueInline); |
| 1005 ASSERT(display >= INLINE && display <= NONE); | 994 ASSERT(display >= INLINE && display <= NONE); |
| 1006 return display; | 995 return display; |
| 1007 } | 996 } |
| 1008 | 997 |
| 1009 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EEmptyCell e) | 998 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EEmptyCell e) |
| 1010 : CSSValue(PrimitiveClass) | 999 : CSSValue(PrimitiveClass) |
| 1011 { | 1000 { |
| 1012 m_primitiveUnitType = CSS_VALUE_ID; | 1001 m_primitiveUnitType = CSS_VALUE_ID; |
| 1013 switch (e) { | 1002 switch (e) { |
| (...skipping 2745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3759 default: | 3748 default: |
| 3760 break; | 3749 break; |
| 3761 } | 3750 } |
| 3762 ASSERT_NOT_REACHED(); | 3751 ASSERT_NOT_REACHED(); |
| 3763 return ScrollBehaviorInstant; | 3752 return ScrollBehaviorInstant; |
| 3764 } | 3753 } |
| 3765 | 3754 |
| 3766 } | 3755 } |
| 3767 | 3756 |
| 3768 #endif | 3757 #endif |
| OLD | NEW |