Drop Image::setContainerSize()

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 30 matching lines @@
 #include "core/html/HTMLFormElement.h"
 #include "core/html/HTMLImageFallbackHelper.h"
 #include "core/html/HTMLSourceElement.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/html/parser/HTMLSrcsetParser.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/layout/LayoutBlockFlow.h"
 #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"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/weborigin/SecurityPolicy.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
@@ skipping 536 matching lines @@
     if (!complete() || !cachedImage()) {
         *status = IncompleteSourceImageStatus;
         return nullptr;
     }
 
     if (cachedImage()->errorOccurred()) {
         *status = UndecodableSourceImageStatus;
         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();
 }
 
 bool HTMLImageElement::wouldTaintOrigin(SecurityOrigin* destinationSecurityOrigin) const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return false;
@@ skipping 185 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());
 }
 
 }