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 4684 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4695 ASSERT(isValueID()); | 4695 ASSERT(isValueID()); |
4696 switch (m_value.valueID) { | 4696 switch (m_value.valueID) { |
4697 case CSSValueNone: | 4697 case CSSValueNone: |
4698 return TouchActionNone; | 4698 return TouchActionNone; |
4699 case CSSValueAuto: | 4699 case CSSValueAuto: |
4700 return TouchActionAuto; | 4700 return TouchActionAuto; |
4701 case CSSValuePanX: | 4701 case CSSValuePanX: |
4702 return TouchActionPanX; | 4702 return TouchActionPanX; |
4703 case CSSValuePanY: | 4703 case CSSValuePanY: |
4704 return TouchActionPanY; | 4704 return TouchActionPanY; |
| 4705 case CSSValueManipulation: |
| 4706 return TouchActionPanX | TouchActionPanY | TouchActionPinchZoom; |
4705 default: | 4707 default: |
4706 break; | 4708 break; |
4707 } | 4709 } |
4708 | 4710 |
4709 ASSERT_NOT_REACHED(); | 4711 ASSERT_NOT_REACHED(); |
4710 return TouchActionNone; | 4712 return TouchActionNone; |
4711 } | 4713 } |
4712 | 4714 |
4713 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i) | 4715 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i) |
4714 : CSSValue(PrimitiveClass) | 4716 : CSSValue(PrimitiveClass) |
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4947 default: | 4949 default: |
4948 break; | 4950 break; |
4949 } | 4951 } |
4950 ASSERT_NOT_REACHED(); | 4952 ASSERT_NOT_REACHED(); |
4951 return ScrollBehaviorInstant; | 4953 return ScrollBehaviorInstant; |
4952 } | 4954 } |
4953 | 4955 |
4954 } | 4956 } |
4955 | 4957 |
4956 #endif | 4958 #endif |
OLD | NEW |