Drop Image::setContainerSize()

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

Index: third_party/WebKit/Source/core/html/HTMLImageElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
index 41c825d84ca957b1463a538137e5949b0f027cd2..13630d9761e94f2ac2f815d41ea9a0423b94e782 100644
--- a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
@@ -48,6 +48,7 @@
 #include "core/layout/LayoutImage.h"
 #include "core/page/Page.h"
 #include "core/style/ContentData.h"
+#include "core/svg/graphics/SVGImageForContainer.h"
 #include "platform/ContentType.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/MIMETypeRegistry.h"
@@ -604,11 +605,13 @@ PassRefPtr<Image> HTMLImageElement::getSourceImageForCanvas(SourceImageStatus* s
         return nullptr;
     }
 
-    RefPtr<Image> sourceImage = cachedImage()->image();
-
-    // We need to synthesize a container size if a layoutObject is not available to provide one.
-    if (!layoutObject() && sourceImage->usesContainerSize())
-        sourceImage->setContainerSize(sourceImage->size());
+    RefPtr<Image> sourceImage;
+    if (cachedImage()->image()->isSVGImage()) {
+        sourceImage = SVGImageForContainer::create(toSVGImage(cachedImage()->image()),

[fs, 2015/12/01 14:23:21]

I get a feeling that it would be better to do the wrapping in the calling code.
I think that would mesh better with spec [1] and make things a bit more
scalable. There's also an isSVGImage() check in CRC2D::drawImage that would now
fail (since SVGImageForContainer::isSVGImage returns false IIRC.)

[davve, 2015/12/01 14:54:16]

Extracting the url would have to go though the CanvasImageSource interface then,
I guess. A bit more cumbersome, but doable.

I agree about the isSVGImage() thing. I removed
SVGImageForContainer::isSVGImage() because isSVGImage() is used for
DEFINE_IMAGE_TYPE_CASTS and it seemed unsafe to mix in SVGImageForContainer
unless we really need it, which we didn't AFAICT.

[davve, 2015/12/01 14:57:38]

Oh, CanvasImageSource has sourceURL already. I doubt it keeps the fragment part
in the HTMLImageElement implementation though.

[fs, 2015/12/01 14:59:22]

Cumbersome, yes...
Yes, there seem to be more good reason for _not_ having it than having it.

[fs, 2015/12/01 15:12:17]

Considering how it's used I'd suspect it doesn't, no. (And the HTMLVideoElement
impl looks a bit scary in that light...)

+            cachedImage()->image()->size(), 1, document().completeURL(imageSourceURL()));
+    } else {
+        sourceImage = cachedImage()->image();
+    }
 
     *status = NormalSourceImageStatus;
     return sourceImage->imageForDefaultFrame();