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 4745 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4756 switch (itemPosition) { | 4756 switch (itemPosition) { |
4757 case ItemPositionAuto: | 4757 case ItemPositionAuto: |
4758 m_value.valueID = CSSValueAuto; | 4758 m_value.valueID = CSSValueAuto; |
4759 break; | 4759 break; |
4760 case ItemPositionStretch: | 4760 case ItemPositionStretch: |
4761 m_value.valueID = CSSValueStretch; | 4761 m_value.valueID = CSSValueStretch; |
4762 break; | 4762 break; |
4763 case ItemPositionBaseline: | 4763 case ItemPositionBaseline: |
4764 m_value.valueID = CSSValueBaseline; | 4764 m_value.valueID = CSSValueBaseline; |
4765 break; | 4765 break; |
| 4766 case ItemPositionLastBaseline: |
| 4767 m_value.valueID = CSSValueLastBaseline; |
| 4768 break; |
4766 case ItemPositionCenter: | 4769 case ItemPositionCenter: |
4767 m_value.valueID = CSSValueCenter; | 4770 m_value.valueID = CSSValueCenter; |
4768 break; | 4771 break; |
4769 case ItemPositionStart: | 4772 case ItemPositionStart: |
4770 m_value.valueID = CSSValueStart; | 4773 m_value.valueID = CSSValueStart; |
4771 break; | 4774 break; |
4772 case ItemPositionEnd: | 4775 case ItemPositionEnd: |
4773 m_value.valueID = CSSValueEnd; | 4776 m_value.valueID = CSSValueEnd; |
4774 break; | 4777 break; |
4775 case ItemPositionSelfStart: | 4778 case ItemPositionSelfStart: |
(...skipping 19 matching lines...) Expand all Loading... |
4795 | 4798 |
4796 template<> inline CSSPrimitiveValue::operator ItemPosition() const | 4799 template<> inline CSSPrimitiveValue::operator ItemPosition() const |
4797 { | 4800 { |
4798 switch (m_value.valueID) { | 4801 switch (m_value.valueID) { |
4799 case CSSValueAuto: | 4802 case CSSValueAuto: |
4800 return ItemPositionAuto; | 4803 return ItemPositionAuto; |
4801 case CSSValueStretch: | 4804 case CSSValueStretch: |
4802 return ItemPositionStretch; | 4805 return ItemPositionStretch; |
4803 case CSSValueBaseline: | 4806 case CSSValueBaseline: |
4804 return ItemPositionBaseline; | 4807 return ItemPositionBaseline; |
| 4808 case CSSValueLastBaseline: |
| 4809 return ItemPositionLastBaseline; |
4805 case CSSValueCenter: | 4810 case CSSValueCenter: |
4806 return ItemPositionCenter; | 4811 return ItemPositionCenter; |
4807 case CSSValueStart: | 4812 case CSSValueStart: |
4808 return ItemPositionStart; | 4813 return ItemPositionStart; |
4809 case CSSValueEnd: | 4814 case CSSValueEnd: |
4810 return ItemPositionEnd; | 4815 return ItemPositionEnd; |
4811 case CSSValueSelfStart: | 4816 case CSSValueSelfStart: |
4812 return ItemPositionSelfStart; | 4817 return ItemPositionSelfStart; |
4813 case CSSValueSelfEnd: | 4818 case CSSValueSelfEnd: |
4814 return ItemPositionSelfEnd; | 4819 return ItemPositionSelfEnd; |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4886 default: | 4891 default: |
4887 break; | 4892 break; |
4888 } | 4893 } |
4889 ASSERT_NOT_REACHED(); | 4894 ASSERT_NOT_REACHED(); |
4890 return ScrollBehaviorInstant; | 4895 return ScrollBehaviorInstant; |
4891 } | 4896 } |
4892 | 4897 |
4893 } | 4898 } |
4894 | 4899 |
4895 #endif | 4900 #endif |
OLD | NEW |