Add ImageLoader support for sizes based Client-Hints RW values

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 302 matching lines @@
         String srcset = source->fastGetAttribute(srcsetAttr);
         if (srcset.isEmpty())
             continue;
         String type = source->fastGetAttribute(typeAttr);
         if (!type.isEmpty() && !supportedImageType(type))
             continue;
 
         if (!source->mediaQueryMatches())
             continue;
 
-        String sizes = source->fastGetAttribute(sizesAttr);
-        if (!sizes.isNull())
-            UseCounter::count(document(), UseCounter::Sizes);
-        SizesAttributeParser parser = SizesAttributeParser(MediaValuesDynamic::create(document()), sizes);
-        float effectiveSize = parser.length();
-        ImageCandidate candidate = bestFitSourceForSrcsetAttribute(document().devicePixelRatio(), effectiveSize, source->fastGetAttribute(srcsetAttr), &document());
+        ImageCandidate candidate = bestFitSourceForSrcsetAttribute(document().devicePixelRatio(), sourceSize(*source), source->fastGetAttribute(srcsetAttr), &document());
         if (candidate.isEmpty())
             continue;
         return candidate;
     }
     return ImageCandidate();
 }
 
 LayoutObject* HTMLImageElement::createLayoutObject(const ComputedStyle& style)
 {
     if (style.hasContent())
@@ skipping 289 matching lines @@
     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);
 }
 
+float HTMLImageElement::sourceSize(Element& element)
+{
+    String sizes = element.fastGetAttribute(sizesAttr);
+    if (!sizes.isNull())
+        UseCounter::count(document(), UseCounter::Sizes);
+    return SizesAttributeParser(MediaValuesDynamic::create(document()), sizes).length();
+}
+
 void HTMLImageElement::selectSourceURL(ImageLoader::UpdateFromElementBehavior behavior)
 {
     if (!document().isActive())
         return;
 
     bool foundURL = false;
     if (RuntimeEnabledFeatures::pictureEnabled()) {
         ImageCandidate candidate = findBestFitImageFromPictureParent();
         if (!candidate.isEmpty()) {
             setBestFitURLAndDPRFromImageCandidate(candidate);
             foundURL = true;
         }
     }
 
     if (!foundURL) {
-        String sizes = fastGetAttribute(sizesAttr);
-        if (!sizes.isNull())
-            UseCounter::count(document(), UseCounter::Sizes);
-        SizesAttributeParser parser = SizesAttributeParser(MediaValuesDynamic::create(document()), sizes);
-        float effectiveSize = parser.length();
-        ImageCandidate candidate = bestFitSourceForImageAttributes(document().devicePixelRatio(), effectiveSize, fastGetAttribute(srcAttr), fastGetAttribute(srcsetAttr), &document());
+        ImageCandidate candidate = bestFitSourceForImageAttributes(document().devicePixelRatio(), sourceSize(*this), fastGetAttribute(srcAttr), fastGetAttribute(srcsetAttr), &document());
         setBestFitURLAndDPRFromImageCandidate(candidate);
     }
     if (m_intrinsicSizingViewportDependant && !m_listener) {
         m_listener = ViewportChangeListener::create(this);
         document().mediaQueryMatcher().addViewportListener(m_listener);
     }
     imageLoader().updateFromElement(behavior);
 
     if (imageLoader().image() || (imageLoader().hasPendingActivity() && !imageSourceURL().isEmpty()))
         ensurePrimaryContent();
@@ skipping 57 matching lines @@
     ensureClosedShadowRoot();
 }
 
 bool HTMLImageElement::isOpaque() const
 {
     Image* image = const_cast<HTMLImageElement*>(this)->imageContents();
     return image && image->currentFrameKnownToBeOpaque();
 }
 
 }