Support fragment URLs for all kinds of SVG images

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 175 matching lines @@
         intrinsicSize = rootElement->currentViewBoxRect().size();
 
     if (!intrinsicSize.isEmpty())
         return expandedIntSize(intrinsicSize);
 
     // As last resort, use CSS replaced element fallback size.
     return IntSize(300, 150);
 }
 
 void SVGImage::drawForContainer(SkCanvas* canvas, const SkPaint& paint, const FloatSize containerSize, float zoom, const FloatRect& dstRect,
-    const FloatRect& srcRect)
+    const FloatRect& srcRect, const KURL& urlWithFragment)
 {
     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);
 
     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);
 
-    draw(canvas, paint, dstRect, scaledSrc, DoNotRespectImageOrientation, ClampImageToSourceRect);
+    frameView()->processUrlFragment(urlWithFragment);
+
+    drawInternal(canvas, paint, dstRect, scaledSrc, DoNotRespectImageOrientation, ClampImageToSourceRect);
 }
 
 PassRefPtr<SkImage> SVGImage::imageForCurrentFrame()
 {
     if (!m_page)
         return nullptr;
 
     SkPictureRecorder recorder;
     SkCanvas* canvas = recorder.beginRecording(width(), height());
-    drawForContainer(canvas, SkPaint(), size(), 1, rect(), rect());
+    drawForContainer(canvas, SkPaint(), size(), 1, rect(), rect(), KURL());
     RefPtr<SkPicture> picture = adoptRef(recorder.endRecording());
 
     return adoptRef(
         SkImage::NewFromPicture(picture.get(), SkISize::Make(width(), height()), nullptr, nullptr));
 }
 
 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 IntSize& repeatSpacing)
+    const IntSize& repeatSpacing, const KURL& urlWithFragment)
 {
     // Tile adjusted for scaling/stretch.
     FloatRect tile(srcRect);
     tile.scale(tileScale.width(), tileScale.height());
 
     // Expand the tile to account for repeat spacing.
     FloatRect spacedTile(tile);
     spacedTile.expand(repeatSpacing);
 
     SkPictureBuilder patternPicture(spacedTile, nullptr, context);
     if (!DrawingRecorder::useCachedDrawingIfPossible(patternPicture.context(), *this, DisplayItem::Type::SVGImage)) {
         DrawingRecorder patternPictureRecorder(patternPicture.context(), *this, DisplayItem::Type::SVGImage, spacedTile);
         // When generating an expanded tile, make sure we don't draw into the spacing area.
         if (tile != spacedTile)
             patternPicture.context().clip(tile);
         SkPaint paint;
-        drawForContainer(patternPicture.context().canvas(), paint, containerSize, zoom, tile, srcRect);
+        drawForContainer(patternPicture.context().canvas(), paint, containerSize, zoom, tile, srcRect, urlWithFragment);
     }
     RefPtr<const SkPicture> tilePicture = patternPicture.endRecording();
 
     SkMatrix patternTransform;
     patternTransform.setTranslate(phase.x() + spacedTile.x(), phase.y() + spacedTile.y());
     RefPtr<SkShader> patternShader = adoptRef(SkShader::CreatePictureShader(
         tilePicture.get(), SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode,
         &patternTransform, nullptr));
 
     SkPaint paint;
@@ skipping 10 matching lines @@
 
     SkXfermode::Mode xfermode;
     if (SkXfermode::AsMode(paint.getXfermode(), &xfermode)) {
         if (xfermode != SkXfermode::kSrcOver_Mode)
             return true;
     }
 
     return false;
 }
 
-void SVGImage::draw(SkCanvas* canvas, const SkPaint& paint, const FloatRect& dstRect, const FloatRect& srcRect, RespectImageOrientationEnum, ImageClampingMode)
+void SVGImage::draw(SkCanvas* canvas, const SkPaint& paint, const FloatRect& dstRect, const FloatRect& srcRect,
+    RespectImageOrientationEnum shouldRespectImageOrientation, ImageClampingMode clampMode)
 {
     if (!m_page)
         return;
 
+    // Reset any previous URL fragment identifier.
+    frameView()->processUrlFragment(KURL());
+
+    drawInternal(canvas, paint, dstRect, srcRect, shouldRespectImageOrientation, clampMode);
+}
+
+void SVGImage::drawInternal(SkCanvas* canvas, const SkPaint& paint, const FloatRect& dstRect, const FloatRect& srcRect,
+    RespectImageOrientationEnum, ImageClampingMode)
+{
     FrameView* view = frameView();
     view->resize(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(m_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
         // of the image would be if we were drawing without clipping, and translate accordingly.
         FloatSize scale(dstRect.width() / srcRect.width(), dstRect.height() / srcRect.height());
         FloatSize topLeftOffset(srcRect.location().x() * scale.width(), srcRect.location().y() * scale.height());
         FloatPoint destOffset = dstRect.location() - topLeftOffset;
         AffineTransform transform = AffineTransform::translation(destOffset.x(), destOffset.y());
@@ skipping 174 matching lines @@
 
     return m_page;
 }
 
 String SVGImage::filenameExtension() const
 {
     return "svg";
 }
 
 }