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

Timestamp:

Jun 13, 2012, 6:04:21 AM (13 years ago)

Author:

[email protected]

Message:

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

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

Source/WebCore:

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

• css/CSSGrammar.y:
• css/CSSParser.cpp:

(WebCore::CSSParser::validUnit):
(WebCore::CSSParser::createPrimitiveNumericValue):
(WebCore::unitFromString):
(WebCore::CSSParser::parseValidPrimitive):
(WebCore::CSSParser::detectNumberToken):

• css/CSSPrimitiveValue.cpp:

(WebCore::isValidCSSUnitTypeForDoubleConversion):
(WebCore::unitCategory):
(WebCore::conversionToCanonicalUnitsScaleFactor):
(WebCore::CSSPrimitiveValue::customCssText):
(WebCore::CSSPrimitiveValue::cloneForCSSOM):

• css/CSSPrimitiveValue.h:

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

@@ -63 +63 @@
 #if ENABLE(CSS_IMAGE_RESOLUTION)
     case CSSPrimitiveValue:: CSS_DPPX:
+    case CSSPrimitiveValue:: CSS_DPI:
 #endif
     case CSSPrimitiveValue:: CSS_EMS:
@@ -91 +92 @@
 #if !ENABLE(CSS_IMAGE_RESOLUTION)
     case CSSPrimitiveValue:: CSS_DPPX:
+    case CSSPrimitiveValue:: CSS_DPI:
 #endif
     case CSSPrimitiveValue:: CSS_IDENT:
@@ -149 +151 @@
 #if ENABLE(CSS_IMAGE_RESOLUTION)
     case CSSPrimitiveValue:: CSS_DPPX:
+    case CSSPrimitiveValue:: CSS_DPI:
         return CSSPrimitiveValue::UResolution;
 #endif
@@ -571 +574 @@
             factor = cssPixelsPerInch;
             break;
+        case CSSPrimitiveValue::CSS_DPI:
+            factor = 1 / cssPixelsPerInch;
+            break;
         case CSSPrimitiveValue::CSS_PT:
             factor = cssPixelsPerInch / 72.0;
@@ -855 +861 @@
         case CSS_DPPX:
             text = formatNumber(m_value.num) + "dppx";
+            break;
+        case CSS_DPI:
+            text = formatNumber(m_value.num) + "dpi";
             break;
 #endif
@@ -1198 +1207 @@
 #if ENABLE(CSS_IMAGE_RESOLUTION)
     case CSS_DPPX:
+    case CSS_DPI:
 #endif
         result = CSSPrimitiveValue::create(m_value.num, static_cast<UnitTypes>(m_primitiveUnitType));