Changeset 120641 in webkit for trunk/Source/WebCore/css/StyleBuilder.cpp

Timestamp:

Jun 18, 2012, 4:30:29 PM (13 years ago)

Author:

[email protected]

Message:

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

Patch by David Barr <​[email protected]> on 2012-06-18
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/CSSParser.cpp: Accept from-image identifier in image-resolution property.

(WebCore::CSSParser::parseImageResolution): Map CSSValueFromImage to identifier value from cssValuePool.

• css/CSSValueKeywords.in: Add from-image.
• css/StyleBuilder.cpp: Extend ApplyPropertyImageResolution to apply RenderStyle::imageResolutionSource.

(WebCore::ApplyPropertyImageResolution::applyInheritValue): Apply RenderStyle::imageResolutionSource.
(WebCore::ApplyPropertyImageResolution::applyInitialValue): Apply RenderStyle::imageResolutionSource.
(WebCore::ApplyPropertyImageResolution::applyValue): Map CSSValueFromImage to ImageResolutionFromImage.

• rendering/RenderImage.cpp: Extend conditions for recalculation of intrinsic size.

(WebCore::RenderImage::styleDidChange): Update intrinsic size if RenderStyle::imageResolutionSource() has changed.

• rendering/style/RenderStyle.cpp: Include StyleRareInheritedData::m_imageResolutionSource in style diff.

(WebCore::RenderStyle::diff): Map change in StyleRareInheritedData::m_imageResolutionSource to StyleDifferenceLayout.

• rendering/style/RenderStyle.h: Add RenderStyle::imageResolutionSource, RenderStyle::setImageResolutionSource, RenderStyle::initialImageResolutionSource.
• rendering/style/RenderStyleConstants.h: Add enum ImageResolutionSource.
• rendering/style/StyleRareInheritedData.cpp: Add StyleRareInheritedData::m_imageResolutionSource.

(WebCore::StyleRareInheritedData::StyleRareInheritedData): Add m_imageResolutionSource to default and copy constructor.
(WebCore::StyleRareInheritedData::operator==): Include m_imageResolutionSource in comparison.

• rendering/style/StyleRareInheritedData.h: Add StyleRareInheritedData::m_imageResolutionSource.

(StyleRareInheritedData): Add 1-bit field StyleRareInheritedData::m_imageResolutionSource.

LayoutTests:

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

File:

• trunk/Source/WebCore/css/StyleBuilder.cpp (modified) (4 diffs)

trunk/Source/WebCore/css/StyleBuilder.cpp

@@ -1773 +1773 @@
     static void applyInheritValue(StyleResolver* styleResolver)
     {
+        ApplyPropertyDefaultBase<ImageResolutionSource, &RenderStyle::imageResolutionSource, ImageResolutionSource, &RenderStyle::setImageResolutionSource, ImageResolutionSource, &RenderStyle::initialImageResolutionSource>::applyInheritValue(styleResolver);
         ApplyPropertyDefaultBase<float, &RenderStyle::imageResolution, float, &RenderStyle::setImageResolution, float, &RenderStyle::initialImageResolution>::applyInheritValue(styleResolver);
     }
@@ -1778 +1779 @@
     static void applyInitialValue(StyleResolver* styleResolver)
     {
+        ApplyPropertyDefaultBase<ImageResolutionSource, &RenderStyle::imageResolutionSource, ImageResolutionSource, &RenderStyle::setImageResolutionSource, ImageResolutionSource, &RenderStyle::initialImageResolutionSource>::applyInitialValue(styleResolver);
         ApplyPropertyDefaultBase<float, &RenderStyle::imageResolution, float, &RenderStyle::setImageResolution, float, &RenderStyle::initialImageResolution>::applyInitialValue(styleResolver);
     }
@@ -1786 +1788 @@
             return;
         CSSValueList* valueList = static_cast<CSSValueList*>(value);
+        ImageResolutionSource source = RenderStyle::initialImageResolutionSource();
+        double resolution = RenderStyle::initialImageResolution();
         for (size_t i = 0; i < valueList->length(); i++) {
             CSSValue* item = valueList->itemWithoutBoundsCheck(i);
@@ -1791 +1795 @@
                 continue;
             CSSPrimitiveValue* primitiveValue = static_cast<CSSPrimitiveValue*>(item);
-            styleResolver->style()->setImageResolution(primitiveValue->getDoubleValue(CSSPrimitiveValue::CSS_DPPX));
-        }
+            if (primitiveValue->getIdent() == CSSValueFromImage)
+                source = ImageResolutionFromImage;
+            else
+                resolution = primitiveValue->getDoubleValue(CSSPrimitiveValue::CSS_DPPX);
+        }
+        styleResolver->style()->setImageResolutionSource(source);
+        styleResolver->style()->setImageResolution(resolution);
     }