Fix Preloader Meta Accept-CH bug

Source/core/html/parser/HTMLPreloadScannerTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/html/parser/HTMLPreloadScanner.h"
 
 #include "core/MediaTypeNames.h"
 #include "core/css/MediaValuesCached.h"
 #include "core/fetch/ClientHintsPreferences.h"
@@ skipping 18 matching lines @@
 
 typedef struct {
     const char* baseURL;
     const char* inputHTML;
     const char* preconnectedHost;
     CrossOriginAttributeValue crossOrigin;
 } PreconnectTestCase;
 
 class MockHTMLResourcePreloader : public ResourcePreloader {
 public:
-    void preloadRequestVerification(Resource::Type type, const String& url, const String& baseURL, int width)
+    void preloadRequestVerification(Resource::Type type, const String& url, const String& baseURL, int width, const ClientHintsPreferences& preferences)
     {
         EXPECT_FALSE(m_preloadRequest->isPreconnect());
         EXPECT_EQ(type, m_preloadRequest->resourceType());
         EXPECT_STREQ(url.ascii().data(), m_preloadRequest->resourceURL().ascii().data());
         EXPECT_STREQ(baseURL.ascii().data(), m_preloadRequest->baseURL().string().ascii().data());
         EXPECT_EQ(width, m_preloadRequest->resourceWidth());
+        EXPECT_EQ(preferences.shouldSendDPR(), m_preloadRequest->preferences().shouldSendDPR());
+        EXPECT_EQ(preferences.shouldSendResourceWidth(), m_preloadRequest->preferences().shouldSendResourceWidth());
+        EXPECT_EQ(preferences.shouldSendViewportWidth(), m_preloadRequest->preferences().shouldSendViewportWidth());
     }
 
     void preconnectRequestVerification(const String& host, CrossOriginAttributeValue crossOrigin)
     {
         if (!host.isNull()) {
             EXPECT_TRUE(m_preloadRequest->isPreconnect());
             EXPECT_STREQ(m_preloadRequest->resourceURL().ascii().data(), host.ascii().data());
             EXPECT_EQ(m_preloadRequest->isCORS(), crossOrigin != CrossOriginAttributeNotSet);
             EXPECT_EQ(m_preloadRequest->isAllowCredentials(), crossOrigin == CrossOriginAttributeUseCredentials);
         }
@@ skipping 49 matching lines @@
         runSetUp(true);
     }
 
     void test(TestCase testCase)
     {
         MockHTMLResourcePreloader preloader;
         KURL baseURL(ParsedURLString, testCase.baseURL);
         m_scanner->appendToEnd(String(testCase.inputHTML));
         m_scanner->scan(&preloader, baseURL);
 
-        preloader.preloadRequestVerification(testCase.type, testCase.preloadedURL, testCase.outputBaseURL, testCase.resourceWidth);
+        preloader.preloadRequestVerification(testCase.type, testCase.preloadedURL, testCase.outputBaseURL, testCase.resourceWidth, testCase.preferences);
     }
 
     void test(PreconnectTestCase testCase)
     {
         MockHTMLResourcePreloader preloader;
         KURL baseURL(ParsedURLString, testCase.baseURL);
         m_scanner->appendToEnd(String(testCase.inputHTML));
         m_scanner->scan(&preloader, baseURL);
         preloader.preconnectRequestVerification(testCase.preconnectedHost, testCase.crossOrigin);
     }
@@ skipping 95 matching lines @@
 {
     ClientHintsPreferences dpr;
     ClientHintsPreferences resourceWidth;
     ClientHintsPreferences all;
     ClientHintsPreferences viewportWidth;
     dpr.setShouldSendDPR(true);
     all.setShouldSendDPR(true);
     resourceWidth.setShouldSendResourceWidth(true);
     all.setShouldSendResourceWidth(true);
     viewportWidth.setShouldSendViewportWidth(true);
+    all.setShouldSendViewportWidth(true);
     TestCase testCases[] = {
         {"http://example.test", "<meta http-equiv='accept-ch' content='bla'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0},
         {"http://example.test", "<meta http-equiv='accept-ch' content='dprw'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0},
         {"http://example.test", "<meta http-equiv='accept-ch'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0},
         {"http://example.test", "<meta http-equiv='accept-ch' content='dpr \t'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, dpr},
         {"http://example.test", "<meta http-equiv='accept-ch' content='bla,dpr \t'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, dpr},
-        {"http://example.test", "<meta http-equiv='accept-ch' content='  width  '><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, resourceWidth},
-        {"http://example.test", "<meta http-equiv='accept-ch' content='  width  , wutever'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, resourceWidth},
-        {"http://example.test", "<meta http-equiv='accept-ch' content='  viewport-width  '><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, resourceWidth},
-        {"http://example.test", "<meta http-equiv='accept-ch' content='  viewport-width  , wutever'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, resourceWidth},
-        {"http://example.test", "<meta http-equiv='accept-ch' content='  viewport-width  ,width, wutever, dpr \t'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, all},
+        {"http://example.test", "<meta http-equiv='accept-ch' content='  width  '><img sizes='100vw' srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 500, resourceWidth},
+        {"http://example.test", "<meta http-equiv='accept-ch' content='  width  , wutever'><img sizes='300px' srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 300, resourceWidth},
+        {"http://example.test", "<meta http-equiv='accept-ch' content='  viewport-width  '><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, viewportWidth},
+        {"http://example.test", "<meta http-equiv='accept-ch' content='  viewport-width  , wutever'><img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0, viewportWidth},
+        {"http://example.test", "<meta http-equiv='accept-ch' content='  viewport-width  ,width, wutever, dpr \t'><img sizes='90vw' srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 450, all},
     };
 
-    for (const auto& testCase : testCases)
+    for (const auto& testCase : testCases) {
+        runSetUp(false);
         test(testCase);
+    }
 }
 
 TEST_F(HTMLPreloadScannerTest, testPreconnect)
 {
     PreconnectTestCase testCases[] = {
         {"http://example.test", "<link rel=preconnect href=http://example2.test>", "http://example2.test", CrossOriginAttributeNotSet},
         {"http://example.test", "<link rel=preconnect href=http://example2.test crossorigin=anonymous>", "http://example2.test", CrossOriginAttributeAnonymous},
         {"http://example.test", "<link rel=preconnect href=http://example2.test crossorigin='use-credentials'>", "http://example2.test", CrossOriginAttributeUseCredentials},
         {"http://example.test", "<link rel=preconnected href=http://example2.test crossorigin='use-credentials'>", nullptr, CrossOriginAttributeNotSet},
         {"http://example.test", "<link rel=preconnect href=ws://example2.test crossorigin='use-credentials'>", nullptr, CrossOriginAttributeNotSet},
     };
 
     for (const auto& testCase : testCases)
         test(testCase);
 }
 
 } // namespace blink