commit e52495584422c5edb5b2944981473a2e208da323
author Torne (Richard Coles) <torne@google.com> Wed May 15 11:35:13 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Wed May 15 11:35:13 2013 +0100
tree 707b85435adfb2c67b9ca3d346769564c41566fd
parent 8521fccd3e39d65a1f2ac1f360f5ead86fcb7dae

Merge from Chromium at DEPS revision r200144

This commit was generated by merge_to_master.py.

Change-Id: I52995489013675af682cee321f417f624396b584

Source/core/css/CSSPrimitiveValue.h

diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h
index dc3dc30..2284218 100644
--- a/Source/core/css/CSSPrimitiveValue.h
+++ b/Source/core/css/CSSPrimitiveValue.h
@@ -139,9 +139,7 @@
         UTime,
         UFrequency,
         UViewportPercentageLength,
-#if ENABLE(RESOLUTION_MEDIA_QUERY)
         UResolution,
-#endif
         UOther
     };
 
@@ -183,6 +181,11 @@
     bool isDotsPerInch() const { return primitiveType() == CSS_DPI; }
     bool isDotsPerPixel() const { return primitiveType() == CSS_DPPX; }
     bool isDotsPerCentimeter() const { return primitiveType() == CSS_DPCM; }
+    bool isResolution() const
+    {
+        unsigned short type = primitiveType();
+        return type >= CSS_DPPX && type <= CSS_DPCM;
+    }
     bool isVariableName() const { return primitiveType() == CSS_VARIABLE_NAME; }
     bool isViewportPercentageLength() const { return m_primitiveUnitType >= CSS_VW && m_primitiveUnitType <= CSS_VMAX; }
     bool isFlex() const { return primitiveType() == CSS_FR; }
@@ -361,6 +364,21 @@
     } m_value;
 };
 
+inline CSSPrimitiveValue* toCSSPrimitiveValue(CSSValue* value)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isPrimitiveValue());
+    return static_cast<CSSPrimitiveValue*>(value);
+}
+
+inline const CSSPrimitiveValue* toCSSPrimitiveValue(const CSSValue* value)
+{
+    ASSERT_WITH_SECURITY_IMPLICATION(!value || value->isPrimitiveValue());
+    return static_cast<const CSSPrimitiveValue*>(value);
+}
+
+// Catch unneeded cast.
+void toCSSPrimitiveValue(const CSSPrimitiveValue*);
+
 } // namespace WebCore
 
 #endif // CSSPrimitiveValue_h