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 4629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4640 switch (itemPosition) { | 4640 switch (itemPosition) { |
4641 case ItemPositionAuto: | 4641 case ItemPositionAuto: |
4642 m_value.valueID = CSSValueAuto; | 4642 m_value.valueID = CSSValueAuto; |
4643 break; | 4643 break; |
4644 case ItemPositionStretch: | 4644 case ItemPositionStretch: |
4645 m_value.valueID = CSSValueStretch; | 4645 m_value.valueID = CSSValueStretch; |
4646 break; | 4646 break; |
4647 case ItemPositionBaseline: | 4647 case ItemPositionBaseline: |
4648 m_value.valueID = CSSValueBaseline; | 4648 m_value.valueID = CSSValueBaseline; |
4649 break; | 4649 break; |
| 4650 case ItemPositionLastBaseline: |
| 4651 m_value.valueID = CSSValueLastBaseline; |
| 4652 break; |
4650 case ItemPositionCenter: | 4653 case ItemPositionCenter: |
4651 m_value.valueID = CSSValueCenter; | 4654 m_value.valueID = CSSValueCenter; |
4652 break; | 4655 break; |
4653 case ItemPositionStart: | 4656 case ItemPositionStart: |
4654 m_value.valueID = CSSValueStart; | 4657 m_value.valueID = CSSValueStart; |
4655 break; | 4658 break; |
4656 case ItemPositionEnd: | 4659 case ItemPositionEnd: |
4657 m_value.valueID = CSSValueEnd; | 4660 m_value.valueID = CSSValueEnd; |
4658 break; | 4661 break; |
4659 case ItemPositionSelfStart: | 4662 case ItemPositionSelfStart: |
(...skipping 19 matching lines...) Expand all Loading... |
4679 | 4682 |
4680 template<> inline CSSPrimitiveValue::operator ItemPosition() const | 4683 template<> inline CSSPrimitiveValue::operator ItemPosition() const |
4681 { | 4684 { |
4682 switch (m_value.valueID) { | 4685 switch (m_value.valueID) { |
4683 case CSSValueAuto: | 4686 case CSSValueAuto: |
4684 return ItemPositionAuto; | 4687 return ItemPositionAuto; |
4685 case CSSValueStretch: | 4688 case CSSValueStretch: |
4686 return ItemPositionStretch; | 4689 return ItemPositionStretch; |
4687 case CSSValueBaseline: | 4690 case CSSValueBaseline: |
4688 return ItemPositionBaseline; | 4691 return ItemPositionBaseline; |
| 4692 case CSSValueLastBaseline: |
| 4693 return ItemPositionLastBaseline; |
4689 case CSSValueCenter: | 4694 case CSSValueCenter: |
4690 return ItemPositionCenter; | 4695 return ItemPositionCenter; |
4691 case CSSValueStart: | 4696 case CSSValueStart: |
4692 return ItemPositionStart; | 4697 return ItemPositionStart; |
4693 case CSSValueEnd: | 4698 case CSSValueEnd: |
4694 return ItemPositionEnd; | 4699 return ItemPositionEnd; |
4695 case CSSValueSelfStart: | 4700 case CSSValueSelfStart: |
4696 return ItemPositionSelfStart; | 4701 return ItemPositionSelfStart; |
4697 case CSSValueSelfEnd: | 4702 case CSSValueSelfEnd: |
4698 return ItemPositionSelfEnd; | 4703 return ItemPositionSelfEnd; |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4770 default: | 4775 default: |
4771 break; | 4776 break; |
4772 } | 4777 } |
4773 ASSERT_NOT_REACHED(); | 4778 ASSERT_NOT_REACHED(); |
4774 return ScrollBehaviorInstant; | 4779 return ScrollBehaviorInstant; |
4775 } | 4780 } |
4776 | 4781 |
4777 } | 4782 } |
4778 | 4783 |
4779 #endif | 4784 #endif |
OLD | NEW |