commit 521d96ec04ace82590870fb04353ec4f82bb150f
author Torne (Richard Coles) <torne@google.com> Wed Jun 19 11:58:24 2013 +0100
committer Torne (Richard Coles) <torne@google.com> Wed Jun 19 11:58:24 2013 +0100
tree 8981598b38063004860120159ab7856768bbf0bd
parent a07712c240c9f68eb31b526eb0fb2c4c966a05f1

Merge from Chromium at DEPS revision r207203

This commit was generated by merge_to_master.py.

Change-Id: Ia8a6c2a997232c94108d8937f8c2556f42be1c37

Source/core/css/CSSPrimitiveValue.h

diff --git a/Source/core/css/CSSPrimitiveValue.h b/Source/core/css/CSSPrimitiveValue.h
index f3a350b..8e677b1 100644
--- a/Source/core/css/CSSPrimitiveValue.h
+++ b/Source/core/css/CSSPrimitiveValue.h
@@ -147,6 +147,7 @@
         UResolution,
         UOther
     };
+    static UnitCategory unitCategory(CSSPrimitiveValue::UnitTypes);
 
     bool isAngle() const
     {
@@ -321,6 +322,9 @@
 
     void reportDescendantMemoryUsage(MemoryObjectInfo*) const;
 
+    static UnitTypes canonicalUnitTypeForCategory(UnitCategory);
+    static double conversionToCanonicalUnitsScaleFactor(unsigned short unitType);
+
 private:
     CSSPrimitiveValue(CSSValueID);
     CSSPrimitiveValue(CSSPropertyID);
@@ -348,8 +352,6 @@
     static void create(unsigned); // compile-time guard
     template<typename T> operator T*(); // compile-time guard
 
-    static UnitTypes canonicalUnitTypeForCategory(UnitCategory category);
-
     void init(PassRefPtr<Counter>);
     void init(PassRefPtr<Rect>);
     void init(PassRefPtr<Pair>);