Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(147)

Side by Side Diff: third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h

Issue 2513523002: Removed ordering dependencies for ECursor (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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. 4 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved.
5 * (http://www.torchmobile.com/) 5 * (http://www.torchmobile.com/)
6 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com> 6 * Copyright (C) 2009 Jeff Schiller <codedread@gmail.com>
7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
(...skipping 1098 matching lines...) Expand 10 before | Expand all | Expand 10 after
1109 break; 1109 break;
1110 case ECursor::WebkitGrabbing: 1110 case ECursor::WebkitGrabbing:
1111 m_valueID = CSSValueWebkitGrabbing; 1111 m_valueID = CSSValueWebkitGrabbing;
1112 break; 1112 break;
1113 } 1113 }
1114 } 1114 }
1115 1115
1116 template <> 1116 template <>
1117 inline ECursor CSSIdentifierValue::convertTo() const { 1117 inline ECursor CSSIdentifierValue::convertTo() const {
1118 switch (m_valueID) { 1118 switch (m_valueID) {
1119 case CSSValueAuto:
1120 return ECursor::Auto;
1121 case CSSValueCrosshair:
1122 return ECursor::Cross;
1123 case CSSValueDefault:
1124 return ECursor::Default;
1125 case CSSValuePointer:
1126 return ECursor::Pointer;
1127 case CSSValueMove:
1128 return ECursor::Move;
1129 case CSSValueCell:
1130 return ECursor::Cell;
1131 case CSSValueVerticalText:
1132 return ECursor::VerticalText;
1133 case CSSValueContextMenu:
1134 return ECursor::ContextMenu;
1135 case CSSValueAlias:
1136 return ECursor::Alias;
1119 case CSSValueCopy: 1137 case CSSValueCopy:
1120 return ECursor::Copy; 1138 return ECursor::Copy;
1139 case CSSValueNone:
1140 return ECursor::None;
1141 case CSSValueProgress:
1142 return ECursor::Progress;
1143 case CSSValueNoDrop:
1144 return ECursor::NoDrop;
1145 case CSSValueNotAllowed:
1146 return ECursor::NotAllowed;
1147 case CSSValueZoomIn:
1121 case CSSValueWebkitZoomIn: 1148 case CSSValueWebkitZoomIn:
1122 return ECursor::ZoomIn; 1149 return ECursor::ZoomIn;
1150 case CSSValueZoomOut:
1123 case CSSValueWebkitZoomOut: 1151 case CSSValueWebkitZoomOut:
1124 return ECursor::ZoomOut; 1152 return ECursor::ZoomOut;
1125 case CSSValueNone: 1153 case CSSValueEResize:
1126 return ECursor::None; 1154 return ECursor::EResize;
1155 case CSSValueNeResize:
1156 return ECursor::NeResize;
1157 case CSSValueNwResize:
1158 return ECursor::NwResize;
1159 case CSSValueNResize:
1160 return ECursor::NResize;
1161 case CSSValueSeResize:
1162 return ECursor::SeResize;
1163 case CSSValueSwResize:
1164 return ECursor::SwResize;
1165 case CSSValueSResize:
1166 return ECursor::SResize;
1167 case CSSValueWResize:
1168 return ECursor::WResize;
1169 case CSSValueEwResize:
1170 return ECursor::EwResize;
1171 case CSSValueNsResize:
1172 return ECursor::NsResize;
1173 case CSSValueNeswResize:
1174 return ECursor::NeswResize;
1175 case CSSValueNwseResize:
1176 return ECursor::NwseResize;
1177 case CSSValueColResize:
1178 return ECursor::ColResize;
1179 case CSSValueRowResize:
1180 return ECursor::RowResize;
1181 case CSSValueText:
1182 return ECursor::Text;
1183 case CSSValueWait:
1184 return ECursor::Wait;
1185 case CSSValueHelp:
1186 return ECursor::Help;
1187 case CSSValueAllScroll:
1188 return ECursor::AllScroll;
1189 case CSSValueWebkitGrab:
1190 return ECursor::WebkitGrab;
1191 case CSSValueWebkitGrabbing:
1192 return ECursor::WebkitGrabbing;
1127 default: 1193 default:
1128 return static_cast<ECursor>(m_valueID - CSSValueAuto); 1194 break;
1129 } 1195 }
1196
1197 NOTREACHED();
1198 return ECursor::Auto;
alancutter (OOO until 2018) 2016/11/17 06:18:55 This can be moved to the default case, no need for
sashab 2016/11/21 03:27:57 Done, will update style of others to match too (al
1130 } 1199 }
1131 1200
1132 template <> 1201 template <>
1133 inline CSSIdentifierValue::CSSIdentifierValue(EDisplay e) 1202 inline CSSIdentifierValue::CSSIdentifierValue(EDisplay e)
1134 : CSSValue(IdentifierClass) { 1203 : CSSValue(IdentifierClass) {
1135 switch (e) { 1204 switch (e) {
1136 case EDisplay::Inline: 1205 case EDisplay::Inline:
1137 m_valueID = CSSValueInline; 1206 m_valueID = CSSValueInline;
1138 break; 1207 break;
1139 case EDisplay::Block: 1208 case EDisplay::Block:
(...skipping 3523 matching lines...) Expand 10 before | Expand all | Expand 10 after
4663 default: 4732 default:
4664 break; 4733 break;
4665 } 4734 }
4666 ASSERT_NOT_REACHED(); 4735 ASSERT_NOT_REACHED();
4667 return ContainsNone; 4736 return ContainsNone;
4668 } 4737 }
4669 4738
4670 } // namespace blink 4739 } // namespace blink
4671 4740
4672 #endif 4741 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698