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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
diff --git a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
index 568f48b606c9a63d517ef996dfb24a8a6396fc25..7b748c8dff09e6a7d5a027289a2bfe8986aedc22 100644
--- a/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
+++ b/third_party/WebKit/Source/core/css/CSSPrimitiveValueMappings.h
@@ -1116,17 +1116,86 @@ inline CSSIdentifierValue::CSSIdentifierValue(ECursor e)
template <>
inline ECursor CSSIdentifierValue::convertTo() const {
switch (m_valueID) {
+ case CSSValueAuto:
+ return ECursor::Auto;
+ case CSSValueCrosshair:
+ return ECursor::Cross;
+ case CSSValueDefault:
+ return ECursor::Default;
+ case CSSValuePointer:
+ return ECursor::Pointer;
+ case CSSValueMove:
+ return ECursor::Move;
+ case CSSValueCell:
+ return ECursor::Cell;
+ case CSSValueVerticalText:
+ return ECursor::VerticalText;
+ case CSSValueContextMenu:
+ return ECursor::ContextMenu;
+ case CSSValueAlias:
+ return ECursor::Alias;
case CSSValueCopy:
return ECursor::Copy;
+ case CSSValueNone:
+ return ECursor::None;
+ case CSSValueProgress:
+ return ECursor::Progress;
+ case CSSValueNoDrop:
+ return ECursor::NoDrop;
+ case CSSValueNotAllowed:
+ return ECursor::NotAllowed;
+ case CSSValueZoomIn:
case CSSValueWebkitZoomIn:
return ECursor::ZoomIn;
+ case CSSValueZoomOut:
case CSSValueWebkitZoomOut:
return ECursor::ZoomOut;
- case CSSValueNone:
- return ECursor::None;
+ case CSSValueEResize:
+ return ECursor::EResize;
+ case CSSValueNeResize:
+ return ECursor::NeResize;
+ case CSSValueNwResize:
+ return ECursor::NwResize;
+ case CSSValueNResize:
+ return ECursor::NResize;
+ case CSSValueSeResize:
+ return ECursor::SeResize;
+ case CSSValueSwResize:
+ return ECursor::SwResize;
+ case CSSValueSResize:
+ return ECursor::SResize;
+ case CSSValueWResize:
+ return ECursor::WResize;
+ case CSSValueEwResize:
+ return ECursor::EwResize;
+ case CSSValueNsResize:
+ return ECursor::NsResize;
+ case CSSValueNeswResize:
+ return ECursor::NeswResize;
+ case CSSValueNwseResize:
+ return ECursor::NwseResize;
+ case CSSValueColResize:
+ return ECursor::ColResize;
+ case CSSValueRowResize:
+ return ECursor::RowResize;
+ case CSSValueText:
+ return ECursor::Text;
+ case CSSValueWait:
+ return ECursor::Wait;
+ case CSSValueHelp:
+ return ECursor::Help;
+ case CSSValueAllScroll:
+ return ECursor::AllScroll;
+ case CSSValueWebkitGrab:
+ return ECursor::WebkitGrab;
+ case CSSValueWebkitGrabbing:
+ return ECursor::WebkitGrabbing;
default:
- return static_cast<ECursor>(m_valueID - CSSValueAuto);
+ break;
}
+
+ NOTREACHED();
+ 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
}
template <>

Powered by Google App Engine
This is Rietveld 408576698