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 1245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1256 break; | 1256 break; |
1257 case EDisplay::Grid: | 1257 case EDisplay::Grid: |
1258 m_valueID = CSSValueGrid; | 1258 m_valueID = CSSValueGrid; |
1259 break; | 1259 break; |
1260 case EDisplay::InlineGrid: | 1260 case EDisplay::InlineGrid: |
1261 m_valueID = CSSValueInlineGrid; | 1261 m_valueID = CSSValueInlineGrid; |
1262 break; | 1262 break; |
1263 case EDisplay::Contents: | 1263 case EDisplay::Contents: |
1264 m_valueID = CSSValueContents; | 1264 m_valueID = CSSValueContents; |
1265 break; | 1265 break; |
| 1266 case EDisplay::FlowRoot: |
| 1267 m_valueID = CSSValueFlowRoot; |
| 1268 break; |
1266 case EDisplay::None: | 1269 case EDisplay::None: |
1267 m_valueID = CSSValueNone; | 1270 m_valueID = CSSValueNone; |
1268 break; | 1271 break; |
1269 } | 1272 } |
1270 } | 1273 } |
1271 | 1274 |
1272 template <> | 1275 template <> |
1273 inline EDisplay CSSIdentifierValue::convertTo() const { | 1276 inline EDisplay CSSIdentifierValue::convertTo() const { |
1274 switch (m_valueID) { | 1277 switch (m_valueID) { |
1275 case CSSValueInline: | 1278 case CSSValueInline: |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1309 return EDisplay::Flex; | 1312 return EDisplay::Flex; |
1310 case CSSValueInlineFlex: | 1313 case CSSValueInlineFlex: |
1311 case CSSValueWebkitInlineFlex: | 1314 case CSSValueWebkitInlineFlex: |
1312 return EDisplay::InlineFlex; | 1315 return EDisplay::InlineFlex; |
1313 case CSSValueGrid: | 1316 case CSSValueGrid: |
1314 return EDisplay::Grid; | 1317 return EDisplay::Grid; |
1315 case CSSValueInlineGrid: | 1318 case CSSValueInlineGrid: |
1316 return EDisplay::InlineGrid; | 1319 return EDisplay::InlineGrid; |
1317 case CSSValueContents: | 1320 case CSSValueContents: |
1318 return EDisplay::Contents; | 1321 return EDisplay::Contents; |
| 1322 case CSSValueFlowRoot: |
| 1323 return EDisplay::FlowRoot; |
1319 case CSSValueNone: | 1324 case CSSValueNone: |
1320 return EDisplay::None; | 1325 return EDisplay::None; |
1321 break; | 1326 break; |
1322 default: | 1327 default: |
1323 NOTREACHED(); | 1328 NOTREACHED(); |
1324 return EDisplay::None; | 1329 return EDisplay::None; |
1325 } | 1330 } |
1326 } | 1331 } |
1327 | 1332 |
1328 template <> | 1333 template <> |
(...skipping 3456 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4785 default: | 4790 default: |
4786 break; | 4791 break; |
4787 } | 4792 } |
4788 ASSERT_NOT_REACHED(); | 4793 ASSERT_NOT_REACHED(); |
4789 return ContainsNone; | 4794 return ContainsNone; |
4790 } | 4795 } |
4791 | 4796 |
4792 } // namespace blink | 4797 } // namespace blink |
4793 | 4798 |
4794 #endif | 4799 #endif |
OLD | NEW |