commit 017dbdad944cbaa1bae4017b182a37bc45bf98cf
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Jun 18 23:30:29 2012 +0000
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon Jun 18 23:30:29 2012 +0000
tree cd542301117d6f3c7a51f3adb2c01853f1e1c531
parent 7beed6191175639abf77449943ce9cb7a9ef32ab

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

Patch by David Barr <davidbarr@chromium.org> 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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@120641 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/rendering/RenderImage.cpp

diff --git a/Source/WebCore/rendering/RenderImage.cpp b/Source/WebCore/rendering/RenderImage.cpp
index b7d7105..093880e 100644
--- a/Source/WebCore/rendering/RenderImage.cpp
+++ b/Source/WebCore/rendering/RenderImage.cpp
@@ -138,7 +138,9 @@
         m_needsToSetSizeForAltText = false;
     }
 #if ENABLE(CSS_IMAGE_RESOLUTION)
-    if (diff == StyleDifferenceLayout && oldStyle->imageResolution() != style()->imageResolution())
+    if (diff == StyleDifferenceLayout
+        && (oldStyle->imageResolution() != style()->imageResolution()
+            || oldStyle->imageResolutionSource() != style()->imageResolutionSource()))
         imageDimensionsChanged(true /* imageSizeChanged */);
 #endif
 }