| Index: Source/core/html/parser/HTMLPreloadScannerTest.cpp
|
| diff --git a/Source/core/html/parser/HTMLPreloadScannerTest.cpp b/Source/core/html/parser/HTMLPreloadScannerTest.cpp
|
| index b6caafef48c30af691ec18f58e0808e196185f67..55a257f377b004b03816e6c6a391d78d35c46a69 100644
|
| --- a/Source/core/html/parser/HTMLPreloadScannerTest.cpp
|
| +++ b/Source/core/html/parser/HTMLPreloadScannerTest.cpp
|
| @@ -8,6 +8,7 @@
|
| #include "core/MediaTypeNames.h"
|
| #include "core/css/MediaValuesCached.h"
|
| #include "core/fetch/ClientHintsPreferences.h"
|
| +#include "core/frame/Settings.h"
|
| #include "core/html/parser/HTMLParserOptions.h"
|
| #include "core/html/parser/HTMLResourcePreloader.h"
|
| #include "core/testing/DummyPageHolder.h"
|
| @@ -72,13 +73,20 @@ protected:
|
| return MediaValuesCached::create(data);
|
| }
|
|
|
| - virtual void SetUp()
|
| + void runSetUp(bool viewportEnabled)
|
| {
|
| HTMLParserOptions options(&m_dummyPageHolder->document());
|
| KURL documentURL(ParsedURLString, "http://whatever.test/");
|
| + m_dummyPageHolder->document().settings()->setViewportEnabled(viewportEnabled);
|
| + m_dummyPageHolder->document().settings()->setViewportMetaEnabled(viewportEnabled);
|
| m_scanner = HTMLPreloadScanner::create(options, documentURL, CachedDocumentParameters::create(&m_dummyPageHolder->document(), createMediaValues()));
|
| }
|
|
|
| + virtual void SetUp()
|
| + {
|
| + runSetUp(true);
|
| + }
|
| +
|
| void test(TestCase testCase)
|
| {
|
| MockHTMLResourcePreloader preloader;
|
| @@ -138,6 +146,29 @@ TEST_F(HTMLPreloadScannerTest, testImagesWithViewport)
|
| test(testCase);
|
| }
|
|
|
| +TEST_F(HTMLPreloadScannerTest, testImagesWithViewportDisabled)
|
| +{
|
| + runSetUp(false);
|
| + TestCase testCases[] = {
|
| + {"http://example.test", "<meta name=viewport content='width=160'><img src='bla.gif'>", "bla.gif", "http://example.test/", Resource::Image, 0},
|
| + {"http://example.test", "<img srcset='bla.gif 320w, blabla.gif 640w'>", "blabla.gif", "http://example.test/", Resource::Image, 0},
|
| + {"http://example.test", "<img sizes='50vw' src='bla.gif'>", "bla.gif", "http://example.test/", Resource::Image, 0},
|
| + {"http://example.test", "<img sizes='50vw' src='bla.gif' srcset='bla2.gif 1x'>", "bla2.gif", "http://example.test/", Resource::Image, 0},
|
| + {"http://example.test", "<img sizes='50vw' src='bla.gif' srcset='bla2.gif 0.5x'>", "bla.gif", "http://example.test/", Resource::Image, 0},
|
| + {"http://example.test", "<img sizes='50vw' src='bla.gif' srcset='bla2.gif 100w'>", "bla2.gif", "http://example.test/", Resource::Image, 250},
|
| + {"http://example.test", "<img sizes='50vw' src='bla.gif' srcset='bla2.gif 100w, bla3.gif 250w'>", "bla3.gif", "http://example.test/", Resource::Image, 250},
|
| + {"http://example.test", "<img sizes='50vw' src='bla.gif' srcset='bla2.gif 100w, bla3.gif 250w, bla4.gif 500w'>", "bla4.gif", "http://example.test/", Resource::Image, 250},
|
| + {"http://example.test", "<img src='bla.gif' srcset='bla2.gif 100w, bla3.gif 250w, bla4.gif 500w' sizes='50vw'>", "bla4.gif", "http://example.test/", Resource::Image, 250},
|
| + {"http://example.test", "<img src='bla.gif' sizes='50vw' srcset='bla2.gif 100w, bla3.gif 250w, bla4.gif 500w'>", "bla4.gif", "http://example.test/", Resource::Image, 250},
|
| + {"http://example.test", "<img sizes='50vw' srcset='bla2.gif 100w, bla3.gif 250w, bla4.gif 500w' src='bla.gif'>", "bla4.gif", "http://example.test/", Resource::Image, 250},
|
| + {"http://example.test", "<img srcset='bla2.gif 100w, bla3.gif 250w, bla4.gif 500w' src='bla.gif' sizes='50vw'>", "bla4.gif", "http://example.test/", Resource::Image, 250},
|
| + {"http://example.test", "<img srcset='bla2.gif 100w, bla3.gif 250w, bla4.gif 500w' sizes='50vw' src='bla.gif'>", "bla4.gif", "http://example.test/", Resource::Image, 250},
|
| + };
|
| +
|
| + for (auto testCase : testCases)
|
| + test(testCase);
|
| +}
|
| +
|
| TEST_F(HTMLPreloadScannerTest, testViewportNoContent)
|
| {
|
| TestCase testCases[] = {
|
|
|