Unprefix CSS cursor values zoom-in and zoom-out

Source/core/css/CSSPrimitiveValueMappings.h

Index: Source/core/css/CSSPrimitiveValueMappings.h
diff --git a/Source/core/css/CSSPrimitiveValueMappings.h b/Source/core/css/CSSPrimitiveValueMappings.h
index 95885c9a7a0867595faf735e326e7f363d136e33..155d5b1b249d374e4dc0c7c951549de46299efce 100644
--- a/Source/core/css/CSSPrimitiveValueMappings.h
+++ b/Source/core/css/CSSPrimitiveValueMappings.h
@@ -1116,11 +1116,11 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ECursor e)
     case CURSOR_NOT_ALLOWED:
         m_value.valueID = CSSValueNotAllowed;
         break;
-    case CURSOR_WEBKIT_ZOOM_IN:
-        m_value.valueID = CSSValueWebkitZoomIn;
+    case CURSOR_ZOOM_IN:
+        m_value.valueID = CSSValueZoomIn;
         break;
-    case CURSOR_WEBKIT_ZOOM_OUT:
-        m_value.valueID = CSSValueWebkitZoomOut;
+    case CURSOR_ZOOM_OUT:
+        m_value.valueID = CSSValueZoomOut;
         break;
     case CURSOR_E_RESIZE:
         m_value.valueID = CSSValueEResize;
@@ -1188,11 +1188,18 @@ template<> inline CSSPrimitiveValue::CSSPrimitiveValue(ECursor e)
 template<> inline CSSPrimitiveValue::operator ECursor() const
 {
     ASSERT(isValueID());
-    if (m_value.valueID == CSSValueCopy)
+    switch (m_value.valueID) {
+    case CSSValueCopy:
         return CURSOR_COPY;
-    if (m_value.valueID == CSSValueNone)
+    case CSSValueWebkitZoomIn:
+        return CURSOR_ZOOM_IN;
+    case CSSValueWebkitZoomOut:

[Julien - ping for review, 2014/05/19 09:17:55]

Wouldn't you also get the unprefixed keywords here too?

[philipj_slow, 2014/05/19 09:52:51]

I could add them here, but they will be handled by the default case. Only the
keywords which aren't in the same order in RenderStyleConstants.h and
CSSValueKeywords.in need manual handling.

+        return CURSOR_ZOOM_OUT;
+    case CSSValueNone:
         return CURSOR_NONE;
-    return static_cast<ECursor>(m_value.valueID - CSSValueAuto);
+    default:
+        return static_cast<ECursor>(m_value.valueID - CSSValueAuto);
+    }
 }
 
 template<> inline CSSPrimitiveValue::CSSPrimitiveValue(EDisplay e)