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 1821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1832 break; | 1832 break; |
1833 case RelativePosition: | 1833 case RelativePosition: |
1834 m_value.valueID = CSSValueRelative; | 1834 m_value.valueID = CSSValueRelative; |
1835 break; | 1835 break; |
1836 case AbsolutePosition: | 1836 case AbsolutePosition: |
1837 m_value.valueID = CSSValueAbsolute; | 1837 m_value.valueID = CSSValueAbsolute; |
1838 break; | 1838 break; |
1839 case FixedPosition: | 1839 case FixedPosition: |
1840 m_value.valueID = CSSValueFixed; | 1840 m_value.valueID = CSSValueFixed; |
1841 break; | 1841 break; |
| 1842 case StickyPosition: |
| 1843 m_value.valueID = CSSValueSticky; |
| 1844 break; |
1842 } | 1845 } |
1843 } | 1846 } |
1844 | 1847 |
1845 template<> inline CSSPrimitiveValue::operator EPosition() const | 1848 template<> inline CSSPrimitiveValue::operator EPosition() const |
1846 { | 1849 { |
1847 ASSERT(isValueID()); | 1850 ASSERT(isValueID()); |
1848 switch (m_value.valueID) { | 1851 switch (m_value.valueID) { |
1849 case CSSValueStatic: | 1852 case CSSValueStatic: |
1850 return StaticPosition; | 1853 return StaticPosition; |
1851 case CSSValueRelative: | 1854 case CSSValueRelative: |
1852 return RelativePosition; | 1855 return RelativePosition; |
1853 case CSSValueAbsolute: | 1856 case CSSValueAbsolute: |
1854 return AbsolutePosition; | 1857 return AbsolutePosition; |
1855 case CSSValueFixed: | 1858 case CSSValueFixed: |
1856 return FixedPosition; | 1859 return FixedPosition; |
| 1860 case CSSValueSticky: |
| 1861 return StickyPosition; |
1857 default: | 1862 default: |
1858 break; | 1863 break; |
1859 } | 1864 } |
1860 | 1865 |
1861 ASSERT_NOT_REACHED(); | 1866 ASSERT_NOT_REACHED(); |
1862 return StaticPosition; | 1867 return StaticPosition; |
1863 } | 1868 } |
1864 | 1869 |
1865 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EResize e) | 1870 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EResize e) |
1866 : CSSValue(PrimitiveClass) | 1871 : CSSValue(PrimitiveClass) |
(...skipping 2806 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4673 default: | 4678 default: |
4674 break; | 4679 break; |
4675 } | 4680 } |
4676 ASSERT_NOT_REACHED(); | 4681 ASSERT_NOT_REACHED(); |
4677 return ScrollSnapTypeNone; | 4682 return ScrollSnapTypeNone; |
4678 } | 4683 } |
4679 | 4684 |
4680 } // namespace blink | 4685 } // namespace blink |
4681 | 4686 |
4682 #endif | 4687 #endif |
OLD | NEW |