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

Source/core/html/parser/HTMLPreloadScanner.h

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 91 matching lines @@
         {
         }
 
         KURL predictedBaseElementURL;
         bool inStyle;
         bool isAppCacheEnabled;
         bool isCSPEnabled;
         size_t templateCount;
     };
 
+    struct PictureData {
+        PictureData()
+            : sourceSize(0.0)
+            , sourceSizeSet(false)
+            , picked(false)
+        {
+        }
+        String sourceURL;
+        float sourceSize;
+        bool sourceSizeSet;
+        bool picked;
+    };
+
     CSSPreloadScanner m_cssScanner;
     const KURL m_documentURL;
     KURL m_predictedBaseElementURL;
     bool m_inStyle;
     bool m_inPicture;
     bool m_isAppCacheEnabled;
     bool m_isCSPEnabled;
-    String m_pictureSourceURL;
+    PictureData m_pictureData;
     size_t m_templateCount;
     OwnPtr<CachedDocumentParameters> m_documentParameters;
     ClientHintsPreferences m_clientHintsPreferences;
 
     Vector<Checkpoint> m_checkpoints;
 };
 
 class CORE_EXPORT HTMLPreloadScanner {
     WTF_MAKE_NONCOPYABLE(HTMLPreloadScanner); WTF_MAKE_FAST_ALLOCATED(HTMLPreloadScanner);
 public:
@@ skipping 12 matching lines @@
 private:
     TokenPreloadScanner m_scanner;
     SegmentedString m_source;
     HTMLToken m_token;
     OwnPtr<HTMLTokenizer> m_tokenizer;
 };
 
 }
 
 #endif