Rename imageSizeForLayoutObject() to imageSize()

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 39 matching lines @@
 #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;
 
+namespace {
+
+RespectImageOrientationEnum shouldRespectImageOrientation(LayoutObject* layoutObject)
+{
+    if (layoutObject)
+        return layoutObject->shouldRespectImageOrientation();
+
+    return DoNotRespectImageOrientation;
+}
+
+} // anonymous namespace
+
 class HTMLImageElement::ViewportChangeListener final : public MediaQueryListListener {
 public:
     static RefPtrWillBeRawPtr<ViewportChangeListener> create(HTMLImageElement* element)
     {
         return adoptRefWillBeNoop(new ViewportChangeListener(element));
     }
 
     void notifyMediaQueryChanged() override
     {
         if (m_element)
@@ skipping 350 matching lines @@
 
     if (!layoutObject()) {
         // check the attribute first for an explicit pixel value
         bool ok;
         int width = getAttribute(widthAttr).toInt(&ok);
         if (ok)
             return width;
 
         // if the image is available, use its width
         if (imageLoader().image())
-            return imageLoader().image()->imageSizeForLayoutObject(layoutObject(), 1.0f).width();
+            return imageLoader().image()->imageSize(DoNotRespectImageOrientation, 1.0f).width();

[Yoav Weiss, 2015/11/24 10:29:07]

Are you sure this does not change behavior? 

I'd go with
s/DoNotRespectImageOrientation/shouldRespectImageOrientation(layoutObject())/

[davve, 2015/11/24 12:49:13]

This is the layoutObject() == null code path.

The alternative would be shouldRespectImageOrientation(nullptr). The upside of
that would be to keep the number of places we encode "no layout object means
DoNotRespectImageOrientation" down.

[Yoav Weiss, 2015/11/24 13:06:56]

Fair enough. I would prefer shouldRespectImageOrientation(nullptr) then

     }
 
     LayoutBox* box = layoutBox();
     return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedWidth(), box) : 0;
 }
 
 int HTMLImageElement::height()
 {
     if (inActiveDocument())
         document().updateLayoutIgnorePendingStylesheets();
 
     if (!layoutObject()) {
         // check the attribute first for an explicit pixel value
         bool ok;
         int height = getAttribute(heightAttr).toInt(&ok);
         if (ok)
             return height;
 
         // if the image is available, use its height
         if (imageLoader().image())
-            return imageLoader().image()->imageSizeForLayoutObject(layoutObject(), 1.0f).height();
+            return imageLoader().image()->imageSize(DoNotRespectImageOrientation, 1.0f).height();

[Yoav Weiss, 2015/11/24 10:29:07]

ditto

[davve, 2015/11/24 12:49:13]

See other reply.

     }
 
     LayoutBox* box = layoutBox();
     return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedHeight(), box) : 0;
 }
 
 int HTMLImageElement::naturalWidth() const
 {
     if (!imageLoader().image())
         return 0;
 
-    return imageLoader().image()->imageSizeForLayoutObject(layoutObject(), m_imageDevicePixelRatio, ImageResource::IntrinsicCorrectedToDPR).width();
+    return imageLoader().image()->imageSize(shouldRespectImageOrientation(layoutObject()), m_imageDevicePixelRatio, ImageResource::IntrinsicCorrectedToDPR).width();
 }
 
 int HTMLImageElement::naturalHeight() const
 {
     if (!imageLoader().image())
         return 0;
 
-    return imageLoader().image()->imageSizeForLayoutObject(layoutObject(), m_imageDevicePixelRatio, ImageResource::IntrinsicCorrectedToDPR).height();
+    return imageLoader().image()->imageSize(shouldRespectImageOrientation(layoutObject()), m_imageDevicePixelRatio, ImageResource::IntrinsicCorrectedToDPR).height();
 }
 
 const String& HTMLImageElement::currentSrc() const
 {
     // http://www.whatwg.org/specs/web-apps/current-work/multipage/edits.html#dom-img-currentsrc
     // The currentSrc IDL attribute must return the img element's current request's current URL.
     // Initially, the pending request turns into current request when it is either available or broken.
     // We use the image's dimensions as a proxy to it being in any of these states.
     if (!imageLoader().image() || !imageLoader().image()->image() || !imageLoader().image()->image()->width())
         return emptyAtom;
@@ skipping 138 matching lines @@
         return false;
     return !image->isAccessAllowed(destinationSecurityOrigin);
 }
 
 FloatSize HTMLImageElement::elementSize() const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return FloatSize();
 
-    return FloatSize(image->imageSizeForLayoutObject(layoutObject(), 1.0f));
+    return FloatSize(image->imageSize(shouldRespectImageOrientation(layoutObject()), 1.0f));
 }
 
 FloatSize HTMLImageElement::defaultDestinationSize() const
 {
     ImageResource* image = cachedImage();
     if (!image)
         return FloatSize();
     LayoutSize size;
-    size = image->imageSizeForLayoutObject(layoutObject(), 1.0f);
+    size = image->imageSize(shouldRespectImageOrientation(layoutObject()), 1.0f);
     if (layoutObject() && layoutObject()->isLayoutImage() && image->image() && !image->image()->hasRelativeWidth())
         size.scale(toLayoutImage(layoutObject())->imageDevicePixelRatio());
     return FloatSize(size);
 }
 
 static bool sourceSizeValue(Element& element, Document& currentDocument, float& sourceSize)
 {
     String sizes = element.fastGetAttribute(sizesAttr);
     bool exists = !sizes.isNull();
     if (exists)
@@ skipping 119 matching lines @@
     ensureUserAgentShadowRoot();
 }
 
 bool HTMLImageElement::isOpaque() const
 {
     Image* image = const_cast<HTMLImageElement*>(this)->imageContents();
     return image && image->currentFrameKnownToBeOpaque();
 }
 
 }