Chromium Code Reviews| 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 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1109 break; | 1109 break; |
| 1110 case CURSOR_PROGRESS: | 1110 case CURSOR_PROGRESS: |
| 1111 m_value.valueID = CSSValueProgress; | 1111 m_value.valueID = CSSValueProgress; |
| 1112 break; | 1112 break; |
| 1113 case CURSOR_NO_DROP: | 1113 case CURSOR_NO_DROP: |
| 1114 m_value.valueID = CSSValueNoDrop; | 1114 m_value.valueID = CSSValueNoDrop; |
| 1115 break; | 1115 break; |
| 1116 case CURSOR_NOT_ALLOWED: | 1116 case CURSOR_NOT_ALLOWED: |
| 1117 m_value.valueID = CSSValueNotAllowed; | 1117 m_value.valueID = CSSValueNotAllowed; |
| 1118 break; | 1118 break; |
| 1119 case CURSOR_WEBKIT_ZOOM_IN: | 1119 case CURSOR_ZOOM_IN: |
| 1120 m_value.valueID = CSSValueWebkitZoomIn; | 1120 m_value.valueID = CSSValueZoomIn; |
| 1121 break; | 1121 break; |
| 1122 case CURSOR_WEBKIT_ZOOM_OUT: | 1122 case CURSOR_ZOOM_OUT: |
| 1123 m_value.valueID = CSSValueWebkitZoomOut; | 1123 m_value.valueID = CSSValueZoomOut; |
| 1124 break; | 1124 break; |
| 1125 case CURSOR_E_RESIZE: | 1125 case CURSOR_E_RESIZE: |
| 1126 m_value.valueID = CSSValueEResize; | 1126 m_value.valueID = CSSValueEResize; |
| 1127 break; | 1127 break; |
| 1128 case CURSOR_NE_RESIZE: | 1128 case CURSOR_NE_RESIZE: |
| 1129 m_value.valueID = CSSValueNeResize; | 1129 m_value.valueID = CSSValueNeResize; |
| 1130 break; | 1130 break; |
| 1131 case CURSOR_NW_RESIZE: | 1131 case CURSOR_NW_RESIZE: |
| 1132 m_value.valueID = CSSValueNwResize; | 1132 m_value.valueID = CSSValueNwResize; |
| 1133 break; | 1133 break; |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1181 break; | 1181 break; |
| 1182 case CURSOR_WEBKIT_GRABBING: | 1182 case CURSOR_WEBKIT_GRABBING: |
| 1183 m_value.valueID = CSSValueWebkitGrabbing; | 1183 m_value.valueID = CSSValueWebkitGrabbing; |
| 1184 break; | 1184 break; |
| 1185 } | 1185 } |
| 1186 } | 1186 } |
| 1187 | 1187 |
| 1188 template<> inline CSSPrimitiveValue::operator ECursor() const | 1188 template<> inline CSSPrimitiveValue::operator ECursor() const |
| 1189 { | 1189 { |
| 1190 ASSERT(isValueID()); | 1190 ASSERT(isValueID()); |
| 1191 if (m_value.valueID == CSSValueCopy) | 1191 if (m_value.valueID == CSSValueCopy) |
|
ojan
2014/05/16 17:23:48
Nit: Should this be a switch now that it has so ma
| |
| 1192 return CURSOR_COPY; | 1192 return CURSOR_COPY; |
| 1193 if (m_value.valueID == CSSValueWebkitZoomIn) | |
| 1194 return CURSOR_ZOOM_IN; | |
| 1195 if (m_value.valueID == CSSValueWebkitZoomOut) | |
| 1196 return CURSOR_ZOOM_OUT; | |
| 1193 if (m_value.valueID == CSSValueNone) | 1197 if (m_value.valueID == CSSValueNone) |
| 1194 return CURSOR_NONE; | 1198 return CURSOR_NONE; |
| 1195 return static_cast<ECursor>(m_value.valueID - CSSValueAuto); | 1199 return static_cast<ECursor>(m_value.valueID - CSSValueAuto); |
| 1196 } | 1200 } |
| 1197 | 1201 |
| 1198 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDisplay e) | 1202 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDisplay e) |
| 1199 : CSSValue(PrimitiveClass) | 1203 : CSSValue(PrimitiveClass) |
| 1200 { | 1204 { |
| 1201 m_primitiveUnitType = CSS_VALUE_ID; | 1205 m_primitiveUnitType = CSS_VALUE_ID; |
| 1202 switch (e) { | 1206 switch (e) { |
| (...skipping 3676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 4879 default: | 4883 default: |
| 4880 break; | 4884 break; |
| 4881 } | 4885 } |
| 4882 ASSERT_NOT_REACHED(); | 4886 ASSERT_NOT_REACHED(); |
| 4883 return ScrollBehaviorInstant; | 4887 return ScrollBehaviorInstant; |
| 4884 } | 4888 } |
| 4885 | 4889 |
| 4886 } | 4890 } |
| 4887 | 4891 |
| 4888 #endif | 4892 #endif |
| OLD | NEW |