Fix SVG sizing in crossfaded images

third_party/WebKit/Source/core/css/CSSCrossfadeValue.cpp

 /*
  * Copyright (C) 2011 Apple Inc.  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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 10 matching lines @@
  * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/css/CSSCrossfadeValue.h"
 
 #include "core/css/CSSImageValue.h"
 #include "core/layout/LayoutObject.h"
 #include "core/style/StyleFetchedImage.h"
+#include "core/svg/graphics/SVGImageForContainer.h"
 #include "platform/graphics/CrossfadeGeneratedImage.h"
 #include "wtf/text/StringBuilder.h"
 
 namespace blink {
 
 static bool subimageIsPending(CSSValue* value)
 {
     if (value->isImageValue())
         return toCSSImageValue(value)->isCachePending();
 
@@ skipping 167 matching lines @@
 {
     if (size.isEmpty())
         return nullptr;
 
     Image* fromImage = renderableImageForCSSValue(m_fromValue.get(), layoutObject);
     Image* toImage = renderableImageForCSSValue(m_toValue.get(), layoutObject);
 
     if (!fromImage || !toImage)
         return Image::nullImage();
 
-    m_generatedImage = CrossfadeGeneratedImage::create(fromImage, toImage, m_percentageValue->getFloatValue(), fixedSize(layoutObject), size);
+    RefPtr<Image> fromImageRef(fromImage);
+    RefPtr<Image> toImageRef(toImage);
+
+    // TODO(davve): Pass along proper URL to the SVG wrappers
+
+    if (fromImage->isSVGImage())
+        fromImageRef = SVGImageForContainer::create(toSVGImage(fromImage), size, 1, KURL());
+
+    if (toImage->isSVGImage())
+        toImageRef = SVGImageForContainer::create(toSVGImage(toImage), size, 1, KURL());
+
+    m_generatedImage = CrossfadeGeneratedImage::create(fromImageRef, toImageRef, m_percentageValue->getFloatValue(), fixedSize(layoutObject), size);
 
     return m_generatedImage.release();
 }
 
 void CSSCrossfadeValue::crossfadeChanged(const IntRect&)
 {
     for (const auto& curr : clients()) {
         LayoutObject* client = const_cast<LayoutObject*>(curr.key);
         client->imageChanged(static_cast<WrappedImagePtr>(this));
     }
@@ skipping 24 matching lines @@
 DEFINE_TRACE_AFTER_DISPATCH(CSSCrossfadeValue)
 {
     visitor->trace(m_fromValue);
     visitor->trace(m_toValue);
     visitor->trace(m_percentageValue);
     visitor->trace(m_crossfadeSubimageObserver);
     CSSImageGeneratorValue::traceAfterDispatch(visitor);
 }
 
 } // namespace blink