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

Timestamp:

Jun 11, 2012, 10:19:26 AM (13 years ago)

Author:

[email protected]

Message:

Add css3-images image-resolution (dppx only)
​https://bugs.webkit.org/show_bug.cgi?id=85332

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

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

Source/WebCore:

Test: fast/css/image-resolution.html

• css/CSSComputedStyleDeclaration.cpp:

(WebCore):
(WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):

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

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

• css/CSSParser.h:
• css/CSSPrimitiveValue.cpp:

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

• css/CSSPrimitiveValue.h:
• css/CSSProperty.cpp:

(WebCore::CSSProperty::isInheritedProperty):

• css/CSSPropertyNames.in:
• css/StyleBuilder.cpp:

(WebCore):
(ApplyPropertyImageResolution):
(WebCore::ApplyPropertyImageResolution::applyInheritValue):
(WebCore::ApplyPropertyImageResolution::applyInitialValue):
(WebCore::ApplyPropertyImageResolution::applyValue):
(WebCore::ApplyPropertyImageResolution::createHandler):
(WebCore::StyleBuilder::StyleBuilder):

• css/StyleResolver.cpp:

(WebCore::StyleResolver::collectMatchingRulesForList):

• rendering/RenderImage.cpp:

(WebCore::RenderImage::styleDidChange):
(WebCore::RenderImage::imageDimensionsChanged):

• rendering/style/RenderStyle.cpp:

(WebCore::RenderStyle::diff):

• rendering/style/RenderStyle.h:
• rendering/style/StyleRareInheritedData.cpp:

(WebCore::StyleRareInheritedData::StyleRareInheritedData):
(WebCore::StyleRareInheritedData::operator==):

• rendering/style/StyleRareInheritedData.h:

(StyleRareInheritedData):

LayoutTests:

• fast/css/image-resolution/image-resolution-expected.txt: Added.
• fast/css/image-resolution/image-resolution.html: Added.
• platform/chromium/TestExpectations: Skip tests until image-resolution implementation lands.
• platform/efl/TestExpectations: Skip tests until image-resolution implementation lands.
• platform/gtk/TestExpectations: Skip tests until image-resolution implementation lands.
• platform/mac/TestExpectations: Skip tests until image-resolution implementation lands.
• platform/qt/TestExpectations: Skip tests until image-resolution implementation lands.

File:

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

trunk/Source/WebCore/css/CSSPrimitiveValue.cpp

@@ -61 +61 @@
     case CSSPrimitiveValue:: CSS_DEG:
     case CSSPrimitiveValue:: CSS_DIMENSION:
+#if ENABLE(CSS_IMAGE_RESOLUTION)
+    case CSSPrimitiveValue:: CSS_DPPX:
+#endif
     case CSSPrimitiveValue:: CSS_EMS:
     case CSSPrimitiveValue:: CSS_EXS:
@@ -86 +89 @@
     case CSSPrimitiveValue:: CSS_COUNTER_NAME:
     case CSSPrimitiveValue:: CSS_DASHBOARD_REGION:
+#if !ENABLE(CSS_IMAGE_RESOLUTION)
+    case CSSPrimitiveValue:: CSS_DPPX:
+#endif
     case CSSPrimitiveValue:: CSS_IDENT:
     case CSSPrimitiveValue:: CSS_PAIR:
@@ -138 +144 @@
     case CSSPrimitiveValue::CSS_VMIN:
         return CSSPrimitiveValue::UViewportPercentageLength;
+#if ENABLE(CSS_IMAGE_RESOLUTION)
+    case CSSPrimitiveValue:: CSS_DPPX:
+        return CSSPrimitiveValue::UResolution;
+#endif
     default:
         return CSSPrimitiveValue::UOther;
@@ -628 +638 @@
     case UViewportPercentageLength:
         return CSS_UNKNOWN; // Cannot convert between numbers and relative lengths.
+#if ENABLE(CSS_IMAGE_RESOLUTION)
+    case UResolution:
+        return CSS_DPPX;
+#endif
     default:
         return CSS_UNKNOWN;
@@ -829 +843 @@
             text = formatNumber(m_value.num) + "cm";
             break;
+#if ENABLE(CSS_IMAGE_RESOLUTION)
+        case CSS_DPPX:
+            text = formatNumber(m_value.num) + "dppx";
+            break;
+#endif
         case CSS_MM:
             text = formatNumber(m_value.num) + "mm";
@@ -1152 +1171 @@
     case CSS_VH:
     case CSS_VMIN:
+#if ENABLE(CSS_IMAGE_RESOLUTION)
+    case CSS_DPPX:
+#endif
         result = CSSPrimitiveValue::create(m_value.num, static_cast<UnitTypes>(m_primitiveUnitType));
         break;