Changeset 120308 in webkit for trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

Timestamp:

Jun 14, 2012, 3:20:51 AM (13 years ago)

Author:

[email protected]

Message:

Add dpcm to css3-images image-resolution
​https://bugs.webkit.org/show_bug.cgi?id=85442

Patch by David Barr <​[email protected]> on 2012-06-14
Reviewed by Tony Chang.

Source/WebCore:

The css3-images module is at candidate recommendation.
​http://www.w3.org/TR/2012/CR-css3-images-20120417/#the-image-resolution

No new tests; extended fast/css/image-resolution/image-resolution.html

• css/CSSGrammar.y: Add DPCM token and unary term.
• css/CSSParser.cpp: Extend range of units accepted for resolution and tokenize "dpcm".

(WebCore::CSSParser::validUnit): Accept CSSPrimitiveValue::CSS_DPCM.
(WebCore::CSSParser::createPrimitiveNumericValue): Accept CSSPrimitiveValue::CSS_DPCM.
(WebCore::unitFromString): Map "dpcm" to CSSPrimitiveValue::CSS_DPCM.
(WebCore::CSSParser::parseValidPrimitive): Accept CSSPrimitiveValue::CSS_DPCM.
(WebCore::CSSParser::detectNumberToken): Map "dpcm" to CSSPrimitiveValue::CSS_DPCM.

• css/CSSPrimitiveValue.cpp: Add CSSPrimitiveValue::CSS_DPCM as a numeric unit.

(WebCore::isValidCSSUnitTypeForDoubleConversion): Accept CSSPrimitiveValue::CSS_DPCM.
(WebCore::unitCategory): Map CSSPrimitiveValue::CSS_DPCM to CSSPrimitiveValue::UResolution.
(WebCore::conversionToCanonicalUnitsScaleFactor): Scale CSSPrimitiveValue::CSS_DPCM to CSSPrimitiveValue::CSS_DPPX.
(WebCore::CSSPrimitiveValue::customCssText): Format CSSPrimitiveValue::CSS_DPCM as "<num>dpcm".
(WebCore::CSSPrimitiveValue::cloneForCSSOM): Accept CSSPrimitiveValue::CSS_DPCM as numeric unit.

• css/CSSPrimitiveValue.h: Add CSSPrimitiveValue::CSS_DPCM.

LayoutTests:

• fast/css/image-resolution/image-resolution-expected.txt:
• fast/css/image-resolution/image-resolution.html:

File:

• trunk/Source/WebCore/css/CSSPrimitiveValue.cpp (modified) (6 diffs)

trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

@@ -64 +64 @@
     case CSSPrimitiveValue:: CSS_DPPX:
     case CSSPrimitiveValue:: CSS_DPI:
+    case CSSPrimitiveValue:: CSS_DPCM:
 #endif
     case CSSPrimitiveValue:: CSS_EMS:
@@ -93 +94 @@
     case CSSPrimitiveValue:: CSS_DPPX:
     case CSSPrimitiveValue:: CSS_DPI:
+    case CSSPrimitiveValue:: CSS_DPCM:
 #endif
     case CSSPrimitiveValue:: CSS_IDENT:
@@ -152 +154 @@
     case CSSPrimitiveValue:: CSS_DPPX:
     case CSSPrimitiveValue:: CSS_DPI:
+    case CSSPrimitiveValue:: CSS_DPCM:
         return CSSPrimitiveValue::UResolution;
 #endif
@@ -568 +571 @@
             factor = cssPixelsPerInch / 2.54; // (2.54 cm/in)
             break;
+        case CSSPrimitiveValue::CSS_DPCM:
+            factor = 2.54 / cssPixelsPerInch; // (2.54 cm/in)
+            break;
         case CSSPrimitiveValue::CSS_MM:
             factor = cssPixelsPerInch / 25.4;
@@ -864 +870 @@
         case CSS_DPI:
             text = formatNumber(m_value.num) + "dpi";
+            break;
+        case CSS_DPCM:
+            text = formatNumber(m_value.num) + "dpcm";
             break;
 #endif
@@ -1208 +1217 @@
     case CSS_DPPX:
     case CSS_DPI:
+    case CSS_DPCM:
 #endif
         result = CSSPrimitiveValue::create(m_value.num, static_cast<UnitTypes>(m_primitiveUnitType));