Revert of Revert of Fix CH Width header when preloadScanner and <picture> are involved

Source/core/html/parser/HTMLPreloadScanner.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * Copyright (C) 2009 Torch Mobile, Inc. http://www.torchmobile.com/
  * Copyright (C) 2010 Google Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 146 matching lines @@
     }
 
     void processAttributes(const Vector<CompactHTMLToken::Attribute>& attributes)
     {
         if (!m_tagImpl)
             return;
         for (const CompactHTMLToken::Attribute& htmlTokenAttribute : attributes)
             processAttribute(htmlTokenAttribute.name, htmlTokenAttribute.value);
     }
 
-    void handlePictureSourceURL(String& sourceURL)
+    void handlePictureSourceURL(PictureData& pictureData)
     {
-        if (match(m_tagImpl, sourceTag) && m_matchedMediaAttribute && sourceURL.isEmpty())
-            sourceURL = m_srcsetImageCandidate.toString();
-        else if (match(m_tagImpl, imgTag) && !sourceURL.isEmpty())
-            setUrlToLoad(sourceURL, AllowURLReplacement);
+        if (match(m_tagImpl, sourceTag) && m_matchedMediaAttribute && pictureData.sourceURL.isEmpty()) {
+            pictureData.sourceURL = m_srcsetImageCandidate.toString();
+            pictureData.sourceSizeSet = m_sourceSizeSet;
+            pictureData.sourceSize = m_sourceSize;
+            pictureData.picked = true;
+        } else if (match(m_tagImpl, imgTag) && !pictureData.sourceURL.isEmpty()) {
+            setUrlToLoad(pictureData.sourceURL, AllowURLReplacement);
+        }
     }
 
-    PassOwnPtr<PreloadRequest> createPreloadRequest(const KURL& predictedBaseURL, const SegmentedString& source, const ClientHintsPreferences& clientHintsPreferences)
+    PassOwnPtr<PreloadRequest> createPreloadRequest(const KURL& predictedBaseURL, const SegmentedString& source, const ClientHintsPreferences& clientHintsPreferences, const PictureData& pictureData)
     {
         PreloadRequest::RequestType requestType = PreloadRequest::RequestTypePreload;
         if (shouldPreconnect())
             requestType = PreloadRequest::RequestTypePreconnect;
         else if (!shouldPreload() || !m_matchedMediaAttribute)
             return nullptr;
 
         TextPosition position = TextPosition(source.currentLine(), source.currentColumn());
         FetchRequest::ResourceWidth resourceWidth;
-        if (m_sourceSizeSet) {
-            resourceWidth.width = m_sourceSize;
+        float sourceSize = m_sourceSize;
+        bool sourceSizeSet = m_sourceSizeSet;
+        if (pictureData.picked) {
+            sourceSizeSet = pictureData.sourceSizeSet;
+            sourceSize = pictureData.sourceSize;
+        }
+        if (sourceSizeSet) {
+            resourceWidth.width = sourceSize;
             resourceWidth.isSet = true;
         } else {
             resourceWidth.isSet = m_widthValueSet;
             resourceWidth.width = m_widthValue;
         }
 
         OwnPtr<PreloadRequest> request = PreloadRequest::create(initiatorFor(m_tagImpl), position, m_urlToLoad, predictedBaseURL, resourceType(), resourceWidth, clientHintsPreferences, requestType);
         if (isCORSEnabled())
             request->setCrossOriginEnabled(allowStoredCredentials());
         request->setCharset(charset());
@@ skipping 356 matching lines @@
             if (nameAttribute && equalIgnoringCase(String(nameAttribute->value), "viewport")) {
                 const typename Token::Attribute* contentAttribute = token.getAttributeItem(contentAttr);
                 if (contentAttribute)
                     handleMetaViewport(String(contentAttribute->value), m_documentParameters.get());
                 return;
             }
         }
 
         if (match(tagImpl, pictureTag)) {
             m_inPicture = true;
-            m_pictureSourceURL = String();
+            m_pictureData = PictureData();
             return;
         }
 
         StartTagScanner scanner(tagImpl, m_documentParameters->mediaValues);
         scanner.processAttributes(token.attributes());
         if (m_inPicture)
-            scanner.handlePictureSourceURL(m_pictureSourceURL);
-        OwnPtr<PreloadRequest> request = scanner.createPreloadRequest(m_predictedBaseElementURL, source, m_clientHintsPreferences);
+            scanner.handlePictureSourceURL(m_pictureData);
+        OwnPtr<PreloadRequest> request = scanner.createPreloadRequest(m_predictedBaseElementURL, source, m_clientHintsPreferences, m_pictureData);
         if (request)
             requests.append(request.release());
         return;
     }
     default: {
         return;
     }
     }
 }
 
@@ skipping 53 matching lines @@
         mediaValues = givenMediaValues;
     else
         mediaValues = MediaValuesCached::create(*document);
     ASSERT(mediaValues->isSafeToSendToAnotherThread());
     defaultViewportMinWidth = document->viewportDefaultMinWidth();
     viewportMetaZeroValuesQuirk = document->settings() && document->settings()->viewportMetaZeroValuesQuirk();
     viewportMetaEnabled = document->settings() && document->settings()->viewportMetaEnabled();
 }
 
 }