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 4854 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4865 : CSSValue(PrimitiveClass) | 4865 : CSSValue(PrimitiveClass) |
4866 { | 4866 { |
4867 m_primitiveUnitType = CSS_VALUE_ID; | 4867 m_primitiveUnitType = CSS_VALUE_ID; |
4868 switch (t) { | 4868 switch (t) { |
4869 case TouchActionNone: | 4869 case TouchActionNone: |
4870 m_value.valueID = CSSValueNone; | 4870 m_value.valueID = CSSValueNone; |
4871 break; | 4871 break; |
4872 case TouchActionAuto: | 4872 case TouchActionAuto: |
4873 m_value.valueID = CSSValueAuto; | 4873 m_value.valueID = CSSValueAuto; |
4874 break; | 4874 break; |
4875 case TouchActionPanX: | |
Rick Byers
2013/12/06 21:44:04
I think these two functions should go away. They
gnana
2013/12/10 18:24:37
Removing this two function caused build error. Wor
Rick Byers
2013/12/10 21:57:14
Ok. It's possible I'm missing something here - le
gnana
2013/12/11 14:02:53
Done.
I removed one function. But cannot remove th
Rick Byers
2013/12/12 15:30:35
Yeah, I was thinking you'd want to essentially inl
| |
4876 m_value.valueID = CSSValuePanX; | |
4877 break; | |
4878 case TouchActionPanY: | |
4879 m_value.valueID = CSSValuePanY; | |
4880 break; | |
4875 } | 4881 } |
4876 } | 4882 } |
4877 | 4883 |
4878 template<> inline CSSPrimitiveValue::operator TouchAction() const | 4884 template<> inline CSSPrimitiveValue::operator TouchAction() const |
4879 { | 4885 { |
4880 ASSERT(isValueID()); | 4886 ASSERT(isValueID()); |
4881 switch (m_value.valueID) { | 4887 switch (m_value.valueID) { |
4882 case CSSValueNone: | 4888 case CSSValueNone: |
4883 return TouchActionNone; | 4889 return TouchActionNone; |
4884 case CSSValueAuto: | 4890 case CSSValueAuto: |
4885 return TouchActionAuto; | 4891 return TouchActionAuto; |
4892 case CSSValuePanX: | |
4893 return TouchActionPanX; | |
4894 case CSSValuePanY: | |
4895 return TouchActionPanY; | |
4886 default: | 4896 default: |
4887 break; | 4897 break; |
4888 } | 4898 } |
4889 | 4899 |
4890 ASSERT_NOT_REACHED(); | 4900 ASSERT_NOT_REACHED(); |
4891 return TouchActionNone; | 4901 return TouchActionNone; |
4892 } | 4902 } |
4893 | 4903 |
4894 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i) | 4904 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EIsolation i) |
4895 : CSSValue(PrimitiveClass) | 4905 : CSSValue(PrimitiveClass) |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4984 default: | 4994 default: |
4985 break; | 4995 break; |
4986 } | 4996 } |
4987 ASSERT_NOT_REACHED(); | 4997 ASSERT_NOT_REACHED(); |
4988 return ContentBox; | 4998 return ContentBox; |
4989 } | 4999 } |
4990 | 5000 |
4991 } | 5001 } |
4992 | 5002 |
4993 #endif | 5003 #endif |
OLD | NEW |