Bug 108108 – SVGImage::drawSVGToImageBuffer can combine zoom and scale.

• Status: RESOLVED
• Resolution: FIXED
• Component: SVG

[Philip Rogers]

At the moment SVGImage::drawSVGToImageBuffer handles zoom and scale separately which is unnecessary. We still need to track zoom and scale separately as a key in our image cache (for the moment), but we can combine these for drawing.

[Philip Rogers]

Created attachment 185061 [details]
First pass at a single zoomAndScale parameter

[Tim Horton]

Comment on attachment 185061 [details]
First pass at a single zoomAndScale parameter

View in context: https://bugs.webkit.org/attachment.cgi?id=185061&action=review

Seems reasonable to me!

> Source/WebCore/svg/graphics/SVGImageCache.cpp:107
> +        imageSize.setWidth(scale * sizeAndScales.size.width());
> +        imageSize.setHeight(scale * sizeAndScales.size.height());

imageSize = sizeAndScales.size;
imageSize.scale(scale);

Maybe?

[Philip Rogers]

(In reply to comment #2)
> (From update of attachment 185061 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=185061&action=review
> 
> Seems reasonable to me!

Thank you for the review!

> 
> > Source/WebCore/svg/graphics/SVGImageCache.cpp:107
> > +        imageSize.setWidth(scale * sizeAndScales.size.width());
> > +        imageSize.setHeight(scale * sizeAndScales.size.height());
> 
> imageSize = sizeAndScales.size;
> imageSize.scale(scale);
> 
> Maybe?

This is a good idea but unfortunately we risk losing precision. The container size is stored as a FloatSize whereas imageSize is stored as IntSize, so it's best to multiply the floats together before doing the conversion.

[WebKit Review Bot]

Comment on attachment 185061 [details]
First pass at a single zoomAndScale parameter

Clearing flags on attachment: 185061

Committed r141303: <http://trac.webkit.org/changeset/141303>

[WebKit Review Bot]

All reviewed patches have been landed.  Closing bug.

[Philip Rogers]

(In reply to comment #5)
> All reviewed patches have been landed.  Closing bug.

Rebaselines landed:
http://trac.webkit.org/changeset/141326
http://trac.webkit.org/changeset/141324
http://trac.webkit.org/changeset/141311