Use union type in ImageBitmapFactories.idl

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 612 matching lines @@
 
 FloatSize HTMLImageElement::elementSize() const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return FloatSize();
 
     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();
     if (!image)
         return FloatSize();
     LayoutSize size;
     size = image->imageSizeForLayoutObject(layoutObject(), 1.0f);
     if (layoutObject() && layoutObject()->isLayoutImage() && image->image() && !image->image()->hasRelativeWidth())
         size.scale(toLayoutImage(layoutObject())->imageDevicePixelRatio());
     return FloatSize(size);
@@ skipping 126 matching lines @@
     ensureUserAgentShadowRoot();
 }
 
 bool HTMLImageElement::isOpaque() const
 {
     Image* image = const_cast<HTMLImageElement*>(this)->imageContents();
     return image && image->currentFrameKnownToBeOpaque();
 }
 
 }