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. | 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 1175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1186 break; | 1186 break; |
1187 case EDisplay::InlineFlex: | 1187 case EDisplay::InlineFlex: |
1188 m_valueID = CSSValueInlineFlex; | 1188 m_valueID = CSSValueInlineFlex; |
1189 break; | 1189 break; |
1190 case EDisplay::Grid: | 1190 case EDisplay::Grid: |
1191 m_valueID = CSSValueGrid; | 1191 m_valueID = CSSValueGrid; |
1192 break; | 1192 break; |
1193 case EDisplay::InlineGrid: | 1193 case EDisplay::InlineGrid: |
1194 m_valueID = CSSValueInlineGrid; | 1194 m_valueID = CSSValueInlineGrid; |
1195 break; | 1195 break; |
| 1196 case EDisplay::Contents: |
| 1197 m_valueID = CSSValueContents; |
| 1198 break; |
1196 case EDisplay::None: | 1199 case EDisplay::None: |
1197 m_valueID = CSSValueNone; | 1200 m_valueID = CSSValueNone; |
1198 break; | 1201 break; |
1199 } | 1202 } |
1200 } | 1203 } |
1201 | 1204 |
1202 template <> | 1205 template <> |
1203 inline EDisplay CSSIdentifierValue::convertTo() const { | 1206 inline EDisplay CSSIdentifierValue::convertTo() const { |
1204 if (m_valueID == CSSValueNone) | 1207 if (m_valueID == CSSValueNone) |
1205 return EDisplay::None; | 1208 return EDisplay::None; |
(...skipping 3341 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4547 default: | 4550 default: |
4548 break; | 4551 break; |
4549 } | 4552 } |
4550 ASSERT_NOT_REACHED(); | 4553 ASSERT_NOT_REACHED(); |
4551 return ContainsNone; | 4554 return ContainsNone; |
4552 } | 4555 } |
4553 | 4556 |
4554 } // namespace blink | 4557 } // namespace blink |
4555 | 4558 |
4556 #endif | 4559 #endif |
OLD | NEW |