Index: Source/core/rendering/svg/RenderSVGImage.cpp |
diff --git a/Source/core/rendering/svg/RenderSVGImage.cpp b/Source/core/rendering/svg/RenderSVGImage.cpp |
index 7860926bf3f2106e123e882030cd75b95a5efd6d..2d37048626940ccf7a4b4a8744863112c7a73b73 100644 |
--- a/Source/core/rendering/svg/RenderSVGImage.cpp |
+++ b/Source/core/rendering/svg/RenderSVGImage.cpp |
@@ -62,12 +62,12 @@ bool RenderSVGImage::updateImageViewport() |
bool updatedViewport = false; |
SVGLengthContext lengthContext(image); |
- m_objectBoundingBox = FloatRect(image->x().value(lengthContext), image->y().value(lengthContext), image->width().value(lengthContext), image->height().value(lengthContext)); |
+ m_objectBoundingBox = FloatRect(image->xCurrentValue().value(lengthContext), image->yCurrentValue().value(lengthContext), image->widthCurrentValue().value(lengthContext), image->heightCurrentValue().value(lengthContext)); |
// Images with preserveAspectRatio=none should force non-uniform scaling. This can be achieved |
// by setting the image's container size to its intrinsic size. |
// See: http://www.w3.org/TR/SVG/single-page.html, 7.8 The ‘preserveAspectRatio’ attribute. |
- if (image->preserveAspectRatio().align() == SVGPreserveAspectRatio::SVG_PRESERVEASPECTRATIO_NONE) { |
+ if (image->preserveAspectRatioCurrentValue().align() == SVGPreserveAspectRatio::SVG_PRESERVEASPECTRATIO_NONE) { |
if (CachedImage* cachedImage = m_imageResource->cachedImage()) { |
LayoutSize intrinsicSize = cachedImage->imageSizeForRenderer(0, style()->effectiveZoom()); |
if (intrinsicSize != m_imageResource->imageSize(style()->effectiveZoom())) { |
@@ -163,7 +163,7 @@ void RenderSVGImage::paintForeground(PaintInfo& paintInfo) |
FloatRect srcRect(0, 0, image->width(), image->height()); |
SVGImageElement* imageElement = toSVGImageElement(node()); |
- imageElement->preserveAspectRatio().transformRect(destRect, srcRect); |
+ imageElement->preserveAspectRatioCurrentValue().transformRect(destRect, srcRect); |
bool useLowQualityScaling = false; |
if (style()->svgStyle()->bufferedRendering() != BR_STATIC) |