Support canvas size as default object size

third_party/WebKit/Source/core/html/HTMLImageElement.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 585 matching lines @@
         return nullptr;
 
     return imageLoader().image()->image();
 }
 
 bool HTMLImageElement::isInteractiveContent() const
 {
     return fastHasAttribute(usemapAttr);
 }
 
-PassRefPtr<Image> HTMLImageElement::getSourceImageForCanvas(SourceImageStatus* status, AccelerationHint, SnapshotReason) const
+PassRefPtr<Image> HTMLImageElement::getSourceImageForCanvas(SourceImageStatus* status, AccelerationHint, SnapshotReason, const FloatSize& defaultObjectSize) const
 {
     if (!complete() || !cachedImage()) {
         *status = IncompleteSourceImageStatus;
         return nullptr;
     }
 
     if (cachedImage()->errorOccurred()) {
         *status = UndecodableSourceImageStatus;
         return nullptr;
     }
 
     RefPtr<Image> sourceImage;
     if (cachedImage()->image()->isSVGImage()) {
-        sourceImage = SVGImageForContainer::create(toSVGImage(cachedImage()->image()),
-            cachedImage()->image()->size(), 1, document().completeURL(imageSourceURL()));
+        SVGImage* svgImage = toSVGImage(cachedImage()->image());
+        IntSize imageSize = roundedIntSize(svgImage->concreteObjectSize(defaultObjectSize));
+        sourceImage = SVGImageForContainer::create(svgImage,
+            imageSize, 1, document().completeURL(imageSourceURL()));
     } else {
         sourceImage = cachedImage()->image();
     }
 
     *status = NormalSourceImageStatus;
     return sourceImage->imageForDefaultFrame();
 }
 
 bool HTMLImageElement::isSVGSource() const
 {
     return cachedImage() && cachedImage()->image()->isSVGImage();
 }
 
 bool HTMLImageElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigin) const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return false;
     return !image->isAccessAllowed(destinationSecurityOrigin);
 }
 
-FloatSize HTMLImageElement::elementSize() const
+FloatSize HTMLImageElement::elementSize(const FloatSize& defaultObjectSize) const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return FloatSize();
 
+    if (image->image() && image->image()->isSVGImage())
+        return toSVGImage(cachedImage()->image())->concreteObjectSize(defaultObjectSize);
+
     return FloatSize(image->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f));
 }
 
-FloatSize HTMLImageElement::defaultDestinationSize() const
+FloatSize HTMLImageElement::defaultDestinationSize(const FloatSize& defaultObjectSize) const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return FloatSize();
+
+    if (image->image() && image->image()->isSVGImage())
+        return toSVGImage(cachedImage()->image())->concreteObjectSize(defaultObjectSize);
+
     LayoutSize size;
     size = image->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f);
     if (layoutObject() && layoutObject()->isLayoutImage() && image->image() && !image->image()->hasRelativeSize())
         size.scale(toLayoutImage(layoutObject())->imageDevicePixelRatio());
     return FloatSize(size);
 }
 
 static bool sourceSizeValue(Element& element, Document& currentDocument, float& sourceSize)
 {
     String sizes = element.fastGetAttribute(sizesAttr);
@@ skipping 145 matching lines @@
 {
     ImageResource* image = cachedImage();
     if (!image)
         return IntSize();
     LayoutSize lSize = image->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject()), 1.0f);
     ASSERT(lSize.fraction().isZero());
     return IntSize(lSize.width(), lSize.height());
 }
 
 } // namespace blink