Use union type in ImageBitmapFactories.idl

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 ae94760df80dc15558cfd47ca4327036312ba7e1..9d7990d5b179b32f8012339968a71f0f3c290190 100644
--- a/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLImageElement.cpp
@@ -630,6 +630,15 @@ FloatSize HTMLImageElement::elementSize() const
     return FloatSize(image->imageSizeForLayoutObject(layoutObject(), 1.0f));
 }
 
+IntSize HTMLImageElement::bitmapSourceSize() const
+{
+    ImageResource* image = cachedImage();
+    if (!image)
+        return IntSize();
+    LayoutSize lSize = image->imageSizeForLayoutObject(layoutObject(), 1.0f);

[Justin Novosad, 2015/11/24 17:03:13]

This should not depend on layout. We want access to the raw image resource, not
the version that is resized for layout. An image element that is not attached to
the DOM could be used as a source, in which case layout would not even be
calculated (layoutObject() returns nullptr)

[davve, 2015/11/24 19:51:30]

ImageResource::imageSizeForLayoutObject() doesn't return anything layout related
(it used to do special stuff for SVG, but not anymore). It only uses
layoutObject() for LayoutObject::shouldRespectImageOrientation(). So it depends
if we want the image orientation to be respected here, otherwise we might as
well go to the raw image resource, as you say. Since multiplier is 1,
ImageResource::imageSizeForLayoutObject() doesn't add much more than the
orientation stuff.

(See https://codereview.chromium.org/1468023002/ in an attempt to make this less
confusing and perhaps review :)

[Justin Novosad, 2015/11/24 20:14:58]

Ah, that CL is a great readability improvement.  Xida, can you wait for that to
land and use the new imageSize() method? Also, the literal 1.0f is not readable,
please use a constant with a descriptive name.

[xidachen, 2015/11/25 17:01:54]

Done.

+    return IntSize(lSize.width(), lSize.height());
+}
+
 FloatSize HTMLImageElement::defaultDestinationSize() const
 {
     ImageResource* image = cachedImage();