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

Unified Diff: Source/core/css/CSSPrimitiveValueMappings.h

Issue 288303007: Unprefix CSS cursor values zoom-in and zoom-out (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 7 months 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
« no previous file with comments | « no previous file | Source/core/css/CSSValueKeywords.in » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSPrimitiveValueMappings.h
diff --git a/Source/core/css/CSSPrimitiveValueMappings.h b/Source/core/css/CSSPrimitiveValueMappings.h
index 95885c9a7a0867595faf735e326e7f363d136e33..5c8b558eb6b36ee0bdac128e4aff1a7b23468567 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;
@@ -1190,6 +1190,10 @@ template<> inline CSSPrimitiveValue::operator ECursor() const
ASSERT(isValueID());
if (m_value.valueID == CSSValueCopy)
ojan 2014/05/16 17:23:48 Nit: Should this be a switch now that it has so ma
return CURSOR_COPY;
+ if (m_value.valueID == CSSValueWebkitZoomIn)
+ return CURSOR_ZOOM_IN;
+ if (m_value.valueID == CSSValueWebkitZoomOut)
+ return CURSOR_ZOOM_OUT;
if (m_value.valueID == CSSValueNone)
return CURSOR_NONE;
return static_cast<ECursor>(m_value.valueID - CSSValueAuto);
« no previous file with comments | « no previous file | Source/core/css/CSSValueKeywords.in » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698