SVGImageForContainer::imageForCurrentFrame() needs to account for zoom

third_party/WebKit/Source/core/svg/graphics/SVGImage.cpp

 /*
  * Copyright (C) 2006 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 233 matching lines @@
     // Compensate for the container size rounding by adjusting the source rect.
     FloatSize adjustedSrcSize = scaledSrc.size();
     adjustedSrcSize.scale(roundedContainerSize.width() / containerSize.width(), roundedContainerSize.height() / containerSize.height());
     scaledSrc.setSize(adjustedSrcSize);
 
     drawInternal(canvas, paint, dstRect, scaledSrc, DoNotRespectImageOrientation, ClampImageToSourceRect, url);
 }
 
 sk_sp<SkImage> SVGImage::imageForCurrentFrame()
 {
-    return imageForCurrentFrameForContainer(KURL(), FloatSize(size()));
+    return imageForCurrentFrameForContainer(KURL(), size());
 }
 
 void SVGImage::drawPatternForContainer(GraphicsContext& context, const FloatSize containerSize,
     float zoom, const FloatRect& srcRect, const FloatSize& tileScale, const FloatPoint& phase,
     SkXfermode::Mode compositeOp, const FloatRect& dstRect,
     const FloatSize& repeatSpacing, const KURL& url)
 {
     // Tile adjusted for scaling/stretch.
     FloatRect tile(srcRect);
     tile.scale(tileScale.width(), tileScale.height());
@@ skipping 17 matching lines @@
     patternTransform.setTranslate(phase.x() + spacedTile.x(), phase.y() + spacedTile.y());
 
     SkPaint paint;
     paint.setShader(SkShader::MakePictureShader(std::move(tilePicture),
         SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode, &patternTransform, nullptr));
     paint.setXfermodeMode(compositeOp);
     paint.setColorFilter(sk_ref_sp(context.colorFilter()));
     context.drawRect(dstRect, paint);
 }
 
-sk_sp<SkImage> SVGImage::imageForCurrentFrameForContainer(const KURL& url, const FloatSize& containerSize)
+sk_sp<SkImage> SVGImage::imageForCurrentFrameForContainer(const KURL& url, const IntSize& containerSize)
 {
     if (!m_page)
         return nullptr;
 
-    const FloatRect containerRect(FloatPoint(), containerSize);
+    const FloatRect containerRect((FloatPoint()), FloatSize(containerSize));
 
     SkPictureRecorder recorder;
     SkCanvas* canvas = recorder.beginRecording(containerRect);
-    drawForContainer(canvas, SkPaint(), containerSize, 1, containerRect, containerRect, url);
+    drawForContainer(canvas, SkPaint(), containerRect.size(), 1, containerRect, containerRect, url);
 
-    const IntSize imageSize = roundedIntSize(containerSize);
-    const SkMatrix residualScale = SkMatrix::MakeScale(
-        static_cast<float>(imageSize.width()) / containerSize.width(),
-        static_cast<float>(imageSize.height()) / containerSize.height());
     return SkImage::MakeFromPicture(recorder.finishRecordingAsPicture(),
-        SkISize::Make(imageSize.width(), imageSize.height()), &residualScale, nullptr);
+        SkISize::Make(containerSize.width(), containerSize.height()), nullptr, nullptr);
 }
 
 static bool drawNeedsLayer(const SkPaint& paint)
 {
     if (SkColorGetA(paint.getColor()) < 255)
         return true;
 
     SkXfermode::Mode xfermode;
     if (SkXfermode::AsMode(paint.getXfermode(), &xfermode)) {
         if (xfermode != SkXfermode::kSrcOver_Mode)
@@ skipping 259 matching lines @@
 
     return m_page ? SizeAvailable : SizeUnavailable;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 } // namespace blink