OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 TooDeep, | 44 TooDeep, |
45 NoMoreTokens | 45 NoMoreTokens |
46 }; | 46 }; |
47 | 47 |
48 namespace blink { | 48 namespace blink { |
49 | 49 |
50 static CalculationCategory unitCategory(CSSPrimitiveValue::UnitType type) | 50 static CalculationCategory unitCategory(CSSPrimitiveValue::UnitType type) |
51 { | 51 { |
52 switch (type) { | 52 switch (type) { |
53 case CSSPrimitiveValue::CSS_NUMBER: | 53 case CSSPrimitiveValue::CSS_NUMBER: |
| 54 case CSSPrimitiveValue::CSS_INTEGER: |
54 return CalcNumber; | 55 return CalcNumber; |
55 case CSSPrimitiveValue::CSS_PERCENTAGE: | 56 case CSSPrimitiveValue::CSS_PERCENTAGE: |
56 return CalcPercent; | 57 return CalcPercent; |
57 case CSSPrimitiveValue::CSS_EMS: | 58 case CSSPrimitiveValue::CSS_EMS: |
58 case CSSPrimitiveValue::CSS_EXS: | 59 case CSSPrimitiveValue::CSS_EXS: |
59 case CSSPrimitiveValue::CSS_PX: | 60 case CSSPrimitiveValue::CSS_PX: |
60 case CSSPrimitiveValue::CSS_CM: | 61 case CSSPrimitiveValue::CSS_CM: |
61 case CSSPrimitiveValue::CSS_MM: | 62 case CSSPrimitiveValue::CSS_MM: |
62 case CSSPrimitiveValue::CSS_IN: | 63 case CSSPrimitiveValue::CSS_IN: |
63 case CSSPrimitiveValue::CSS_PT: | 64 case CSSPrimitiveValue::CSS_PT: |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
109 case CSSPrimitiveValue::CSS_HZ: | 110 case CSSPrimitiveValue::CSS_HZ: |
110 case CSSPrimitiveValue::CSS_KHZ: | 111 case CSSPrimitiveValue::CSS_KHZ: |
111 case CSSPrimitiveValue::CSS_VW: | 112 case CSSPrimitiveValue::CSS_VW: |
112 case CSSPrimitiveValue::CSS_VH: | 113 case CSSPrimitiveValue::CSS_VH: |
113 case CSSPrimitiveValue::CSS_VMIN: | 114 case CSSPrimitiveValue::CSS_VMIN: |
114 case CSSPrimitiveValue::CSS_VMAX: | 115 case CSSPrimitiveValue::CSS_VMAX: |
115 case CSSPrimitiveValue::CSS_DPPX: | 116 case CSSPrimitiveValue::CSS_DPPX: |
116 case CSSPrimitiveValue::CSS_DPI: | 117 case CSSPrimitiveValue::CSS_DPI: |
117 case CSSPrimitiveValue::CSS_DPCM: | 118 case CSSPrimitiveValue::CSS_DPCM: |
118 case CSSPrimitiveValue::CSS_FR: | 119 case CSSPrimitiveValue::CSS_FR: |
| 120 case CSSPrimitiveValue::CSS_INTEGER: |
119 return true; | 121 return true; |
120 case CSSPrimitiveValue::CSS_UNKNOWN: | 122 case CSSPrimitiveValue::CSS_UNKNOWN: |
121 case CSSPrimitiveValue::CSS_CUSTOM_IDENT: | 123 case CSSPrimitiveValue::CSS_CUSTOM_IDENT: |
122 case CSSPrimitiveValue::CSS_STRING: | 124 case CSSPrimitiveValue::CSS_STRING: |
123 case CSSPrimitiveValue::CSS_URI: | 125 case CSSPrimitiveValue::CSS_URI: |
124 case CSSPrimitiveValue::CSS_IDENT: | 126 case CSSPrimitiveValue::CSS_IDENT: |
125 case CSSPrimitiveValue::CSS_ATTR: | 127 case CSSPrimitiveValue::CSS_ATTR: |
126 case CSSPrimitiveValue::CSS_COUNTER: | 128 case CSSPrimitiveValue::CSS_COUNTER: |
127 case CSSPrimitiveValue::CSS_RECT: | 129 case CSSPrimitiveValue::CSS_RECT: |
128 case CSSPrimitiveValue::CSS_RGBCOLOR: | 130 case CSSPrimitiveValue::CSS_RGBCOLOR: |
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
759 return adoptRefWillBeNoop(new CSSCalcValue(expression, range)); | 761 return adoptRefWillBeNoop(new CSSCalcValue(expression, range)); |
760 } | 762 } |
761 | 763 |
762 DEFINE_TRACE_AFTER_DISPATCH(CSSCalcValue) | 764 DEFINE_TRACE_AFTER_DISPATCH(CSSCalcValue) |
763 { | 765 { |
764 visitor->trace(m_expression); | 766 visitor->trace(m_expression); |
765 CSSValue::traceAfterDispatch(visitor); | 767 CSSValue::traceAfterDispatch(visitor); |
766 } | 768 } |
767 | 769 |
768 } // namespace blink | 770 } // namespace blink |
OLD | NEW |