Set width and height attributes for <img> if image is loaded from srcset

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
@@ skipping 433 matching lines @@
     if (imageLoader().image()) {
       return imageLoader()
           .image()
           ->imageSize(LayoutObject::shouldRespectImageOrientation(nullptr),
                       1.0f)
           .width()
           .toUnsigned();
     }
   }
 
-  LayoutBox* box = layoutBox();
-  return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedWidth(),
-                                     box)
-             : 0;
+  return layoutBoxWidth();
 }
 
 unsigned HTMLImageElement::height() {
   if (inActiveDocument())
     document().updateStyleAndLayoutIgnorePendingStylesheets();
 
   if (!layoutObject()) {
     // check the attribute first for an explicit pixel value
     unsigned height = 0;
     if (parseHTMLNonNegativeInteger(getAttribute(heightAttr), height))
       return height;
 
     // if the image is available, use its height
     if (imageLoader().image()) {
       return imageLoader()
           .image()
           ->imageSize(LayoutObject::shouldRespectImageOrientation(nullptr),
                       1.0f)
           .height()
           .toUnsigned();
     }
   }
 
-  LayoutBox* box = layoutBox();
-  return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedHeight(),
-                                     box)
-             : 0;
+  return layoutBoxHeight();
 }
 
 unsigned HTMLImageElement::naturalWidth() const {
   if (!imageLoader().image())
     return 0;
 
   return imageLoader()
       .image()
       ->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject()),
                   m_imageDevicePixelRatio,
                   ImageResourceContent::IntrinsicCorrectedToDPR)
       .width()
       .toUnsigned();
 }
 
 unsigned HTMLImageElement::naturalHeight() const {
   if (!imageLoader().image())
     return 0;
 
   return imageLoader()
       .image()
       ->imageSize(LayoutObject::shouldRespectImageOrientation(layoutObject()),
                   m_imageDevicePixelRatio,
                   ImageResourceContent::IntrinsicCorrectedToDPR)
       .height()
       .toUnsigned();
 }
 
+unsigned HTMLImageElement::layoutBoxWidth() const {
+  LayoutBox* box = layoutBox();
+  return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedWidth(),
+                                     box)
+             : 0;
+}
+
+unsigned HTMLImageElement::layoutBoxHeight() const {
+  LayoutBox* box = layoutBox();
+  return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedHeight(),
+                                     box)
+             : 0;
+}
+
 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.
 
   // Return the picked URL string in case of load error.
   if (imageLoader().hadError())
     return m_bestFitImageURL;
   // 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
@@ skipping 387 matching lines @@
 void HTMLImageElement::associateWith(HTMLFormElement* form) {
   if (form && form->isConnected()) {
     m_form = form;
     m_formWasSetByParser = true;
     m_form->associate(*this);
     m_form->didAssociateByParser();
   }
 };
 
 }  // namespace blink