Support SVG fragment URLs in cross faded 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 76 matching lines @@
 static Image* renderableImageForCSSValue(CSSValue* value, const LayoutObject* layoutObject)
 {
     ImageResource* cachedImage = cachedImageForCSSValue(value, &layoutObject->document());
 
     if (!cachedImage || !cachedImage->canRender())
         return nullptr;
 
     return cachedImage->image();
 }
 
+static KURL urlForCSSValue(const CSSValue* value)
+{
+    if (!value->isImageValue())
+        return KURL();
+
+    return KURL(ParsedURLString, toCSSImageValue(*value).url());
+}
+
 CSSCrossfadeValue::CSSCrossfadeValue(PassRefPtrWillBeRawPtr<CSSValue> fromValue, PassRefPtrWillBeRawPtr<CSSValue> toValue, PassRefPtrWillBeRawPtr<CSSPrimitiveValue> percentageValue)
     : CSSImageGeneratorValue(CrossfadeClass)
     , m_fromValue(fromValue)
     , m_toValue(toValue)
     , m_percentageValue(percentageValue)
     , m_cachedFromImage(nullptr)
     , m_cachedToImage(nullptr)
     , m_crossfadeSubimageObserver(this)
 {
 #if ENABLE(OILPAN)
@@ skipping 105 matching lines @@
 
     Image* fromImage = renderableImageForCSSValue(m_fromValue.get(), layoutObject);
     Image* toImage = renderableImageForCSSValue(m_toValue.get(), layoutObject);
 
     if (!fromImage || !toImage)
         return Image::nullImage();
 
     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());
+        fromImageRef = SVGImageForContainer::create(toSVGImage(fromImage), size, 1, urlForCSSValue(m_fromValue.get()));
 
     if (toImage->isSVGImage())
-        toImageRef = SVGImageForContainer::create(toSVGImage(toImage), size, 1, KURL());
+        toImageRef = SVGImageForContainer::create(toSVGImage(toImage), size, 1, urlForCSSValue(m_toValue.get()));
 
     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);
@@ skipping 26 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