Use LayoutUnit for SVG container size

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 114 matching lines @@
 }
 
 static SVGSVGElement* svgRootElement(Page* page)
 {
     if (!page)
         return nullptr;
     LocalFrame* frame = toLocalFrame(page->mainFrame());
     return frame->document()->accessSVGExtensions().rootElement();
 }
 
-void SVGImage::setContainerSize(const IntSize& size)
+void SVGImage::setContainerSize(const LayoutSize& size)
 {
     if (!usesContainerSize())
         return;
 
     SVGSVGElement* rootElement = svgRootElement(m_page.get());
     if (!rootElement)
         return;
 
     FrameView* view = frameView();
-    view->resize(this->containerSize());
+    view->resize(roundedIntSize(this->containerSize()));
 
     LayoutSVGRoot* layoutObject = toLayoutSVGRoot(rootElement->layoutObject());
     if (!layoutObject)
         return;
     layoutObject->setContainerSize(size);
 }
 
-IntSize SVGImage::containerSize() const
+LayoutSize SVGImage::containerSize() const
 {
     SVGSVGElement* rootElement = svgRootElement(m_page.get());
     if (!rootElement)
-        return IntSize();
+        return LayoutSize();
 
     LayoutSVGRoot* layoutObject = toLayoutSVGRoot(rootElement->layoutObject());
     if (!layoutObject)
-        return IntSize();
+        return LayoutSize();
 
     // If a container size is available it has precedence.
-    IntSize containerSize = layoutObject->containerSize();
+    LayoutSize containerSize = layoutObject->containerSize();
     if (!containerSize.isEmpty())
         return containerSize;
 
     // Assure that a container size is always given for a non-identity zoom level.
     ASSERT(layoutObject->style()->effectiveZoom() == 1);
 
     FloatSize intrinsicSize;
     double intrinsicRatio = 0;
     layoutObject->computeIntrinsicRatioInformation(intrinsicSize, intrinsicRatio);
 
     if (intrinsicSize.isEmpty() && intrinsicRatio) {
         if (!intrinsicSize.width() && intrinsicSize.height())
             intrinsicSize.setWidth(intrinsicSize.height() * intrinsicRatio);
         else if (intrinsicSize.width() && !intrinsicSize.height())
             intrinsicSize.setHeight(intrinsicSize.width() / intrinsicRatio);
     }
 
     // TODO(davve): In order to maintain aspect ratio the intrinsic
     // size is faked from the viewBox as a last resort. This may cause
     // unwanted side effects. Preferably we should be able to signal
     // the intrinsic ratio in another way.
     if (intrinsicSize.isEmpty())
         intrinsicSize = rootElement->currentViewBoxRect().size();
 
     if (!intrinsicSize.isEmpty())
-        return expandedIntSize(intrinsicSize);
+        return LayoutSize(intrinsicSize);
 
     // As last resort, use CSS replaced element fallback size.
-    return IntSize(300, 150);
+    return LayoutSize(300, 150);
 }
 
 void SVGImage::drawForContainer(SkCanvas* canvas, const SkPaint& paint, const FloatSize containerSize, float zoom, const FloatRect& dstRect,
     const FloatRect& srcRect, const KURL& url)
 {
     if (!m_page)
         return;
 
     // Temporarily disable the image observer to prevent changeInRect() calls due re-laying out the image.
     ImageObserverDisabler imageObserverDisabler(this);
 
-    IntSize roundedContainerSize = roundedIntSize(containerSize);
-    setContainerSize(roundedContainerSize);
+    setContainerSize(LayoutSize(containerSize));
 
     FloatRect scaledSrc = srcRect;
     scaledSrc.scale(1 / zoom);
 
-    // 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);
 }
 
 PassRefPtr<SkImage> SVGImage::imageForCurrentFrame()
 {
     if (!m_page)
         return nullptr;
 
     SkPictureRecorder recorder;
     SkCanvas* canvas = recorder.beginRecording(width(), height());
@@ skipping 61 matching lines @@
     if (!m_page)
         return;
 
     drawInternal(canvas, paint, dstRect, srcRect, shouldRespectImageOrientation, clampMode, KURL());
 }
 
 void SVGImage::drawInternal(SkCanvas* canvas, const SkPaint& paint, const FloatRect& dstRect, const FloatRect& srcRect,
     RespectImageOrientationEnum, ImageClampingMode, const KURL& url)
 {
     FrameView* view = frameView();
-    view->resize(containerSize());
+    view->resize(roundedIntSize(containerSize()));
 
     // Always call processUrlFragment, even if the url is empty, because
     // there may have been a previous url/fragment that needs to be reset.
     view->processUrlFragment(url);
 
     SkPictureBuilder imagePicture(dstRect);
     {
         ClipRecorder clipRecorder(imagePicture.context(), *this, DisplayItem::ClipNodeImage, LayoutRect(enclosingIntRect(dstRect)));
 
         // We can only draw the entire frame, clipped to the rect we want. So compute where the top left
@@ skipping 187 matching lines @@
         frame->view()->setCanHaveScrollbars(false); // SVG Images will always synthesize a viewBox, if it's not available, and thus never see scrollbars.
         frame->view()->setTransparent(true); // SVG Images are transparent.
 
         m_page = page.release();
 
         TRACE_EVENT0("blink", "SVGImage::dataChanged::load");
         loader.load(FrameLoadRequest(0, blankURL(), SubstituteData(data(), AtomicString("image/svg+xml", AtomicString::ConstructFromLiteral),
             AtomicString("UTF-8", AtomicString::ConstructFromLiteral), KURL(), ForceSynchronousLoad)));
 
         // Set the intrinsic size before a container size is available.
-        m_intrinsicSize = containerSize();
+        m_intrinsicSize = roundedIntSize(containerSize());
     }
 
     return m_page;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 }