Diff
Modified: trunk/LayoutTests/ChangeLog (214387 => 214388)
--- trunk/LayoutTests/ChangeLog 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/LayoutTests/ChangeLog 2017-03-25 00:10:06 UTC (rev 214388)
@@ -1,3 +1,15 @@
+2017-03-24 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r214361.
+
+ This change caused flakiness in http/tests/preload tests.
+
+ Reverted changeset:
+
+ "Add a warning for unused link preloads."
+ https://bugs.webkit.org/show_bug.cgi?id=165670
+ http://trac.webkit.org/changeset/214361
+
2017-03-24 Antoine Quint <[email protected]>
[Modern Media Controls] Remove placard icon if height is compressed
Modified: trunk/LayoutTests/http/tests/preload/download_resources-expected.txt (214387 => 214388)
--- trunk/LayoutTests/http/tests/preload/download_resources-expected.txt 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/LayoutTests/http/tests/preload/download_resources-expected.txt 2017-03-25 00:10:06 UTC (rev 214388)
@@ -1,5 +1,13 @@
-CONSOLE MESSAGE: line 13: <link rel=preload> must have a valid `as` value
-This test makes sure that link preload preloads resources
+CONSOLE MESSAGE: line 11: <link rel=preload> must have a valid `as` value
+PASS internals.isPreloaded('../resources/dummy.js'); is true
+PASS internals.isPreloaded('../resources/dummy.css'); is true
+PASS internals.isPreloaded('../resources/square.png'); is true
+PASS internals.isPreloaded('../resources/Ahem.ttf'); is true
+PASS internals.isPreloaded('../resources/test.mp4'); is true
+PASS internals.isPreloaded('../security/resources/captions.vtt'); is true
+PASS internals.isPreloaded('../resources/dummy.xml?badvalue'); is false
+PASS internals.isPreloaded('../resources/dummy.xml'); is true
+PASS successfullyParsed is true
-PASS Makes sure that preloaded resources are downloaded
+TEST COMPLETE
Modified: trunk/LayoutTests/http/tests/preload/download_resources.html (214387 => 214388)
--- trunk/LayoutTests/http/tests/preload/download_resources.html 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/LayoutTests/http/tests/preload/download_resources.html 2017-03-25 00:10:06 UTC (rev 214388)
@@ -1,43 +1,27 @@
<!DOCTYPE html>
-<script src=""
-<script src=""
-<script>
- var t = async_test('Makes sure that preloaded resources are downloaded');
-</script>
+<html>
+<head>
+<script src=""
<link rel=preload href="" as=script>
<link rel=preload href="" as=style>
-<link rel=preload href="" as=image>
-<link rel=preload href="" as=font crossorigin>
+<link rel=preload href="" as=image>
+<link rel=preload href="" as=font crossorigin>
<link rel=preload href="" as=media>
<link rel=preload href="" as=track>
<link rel=preload href="" as=foobarxmlthing>
<link rel=preload href=""
-<script src=""
+<script src=""
+</head>
+<body>
<script>
- setTimeout(t.step_func(function() {
- assert_true(internals.isPreloaded("../resources/dummy.js"));
- assert_true(internals.isPreloaded("../resources/dummy.css"));
- assert_true(internals.isPreloaded("../resources/square100.png"));
- // FIXME: RT doesn't show downloads for the resources below. Need to investigate why.
- assert_true(internals.isPreloaded("../resources/Ahem.woff"));
- assert_true(internals.isPreloaded("../resources/test.mp4"));
- assert_true(internals.isPreloaded("../security/resources/captions.vtt"));
- assert_false(internals.isPreloaded("../resources/dummy.xml?badvalue"));
- assert_true(internals.isPreloaded("../resources/dummy.xml"));
- document.write('<script src="" + 'ipt>' +
- '<link rel=stylesheet href="" +
- '<img src="" +
- '<video><source src="" +
- '<track kind=subtitles src="" srclang=en>' +
- '</video>' +
- '<style>' +
- ' @font-face { font-family:ahem; src: url(../resources/Ahem.woff); }' +
- ' span { font-family: ahem, Arial; }' +
- '</style>' +
- '<span>This test makes sure that link preload preloads resources</span>');
- var xhr = new XMLHttpRequest();
- xhr.open("GET", "../resources/dummy.xml");
- xhr.send();
- t.done();
- }));
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ shouldBeTrue("internals.isPreloaded('../resources/dummy.js');");
+ shouldBeTrue("internals.isPreloaded('../resources/dummy.css');");
+ shouldBeTrue("internals.isPreloaded('../resources/square.png');");
+ shouldBeTrue("internals.isPreloaded('../resources/Ahem.ttf');");
+ shouldBeTrue("internals.isPreloaded('../resources/test.mp4');");
+ shouldBeTrue("internals.isPreloaded('../security/resources/captions.vtt');");
+ shouldBeFalse("internals.isPreloaded('../resources/dummy.xml?badvalue');");
+ shouldBeTrue("internals.isPreloaded('../resources/dummy.xml');");
</script>
Modified: trunk/LayoutTests/http/tests/preload/onerror_event-expected.txt (214387 => 214388)
--- trunk/LayoutTests/http/tests/preload/onerror_event-expected.txt 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/LayoutTests/http/tests/preload/onerror_event-expected.txt 2017-03-25 00:10:06 UTC (rev 214388)
@@ -1,5 +1,12 @@
-CONSOLE MESSAGE: line 25: <link rel=preload> must have a valid `as` value
-This test makes sure that link preload triggers error events for non-existing resources.
+CONSOLE MESSAGE: line 27: <link rel=preload> must have a valid `as` value
+PASS successfullyParsed is true
-PASS Makes sure that preloaded resources trigger onerror
+TEST COMPLETE
+PASS styleFailed is true
+PASS scriptFailed is true
+PASS imageFailed is true
+PASS fontFailed is true
+PASS trackFailed is true
+PASS gibrishFailed is true
+PASS noTypeFailed is true
Modified: trunk/LayoutTests/http/tests/preload/onerror_event.html (214387 => 214388)
--- trunk/LayoutTests/http/tests/preload/onerror_event.html 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/LayoutTests/http/tests/preload/onerror_event.html 2017-03-25 00:10:06 UTC (rev 214388)
@@ -1,9 +1,11 @@
<!DOCTYPE html>
-<script src=""
-<script src=""
<script>
- var t = async_test('Makes sure that preloaded resources trigger onerror');
+ if (window.testRunner) {
+ testRunner.dumpAsText()
+ testRunner.waitUntilDone();
+ }
</script>
+<script src=""
<script>
var scriptFailed = false;
var styleFailed = false;
@@ -25,36 +27,20 @@
<link rel=preload href="" as=foobarxmlthing _onerror_="count();gibrishFailed = true;" _onload_="count();">
<link rel=preload href="" _onerror_="count();noTypeFailed = true;" _onload_="count();">
<script>
- document.write('<script src="" + 'ipt>' +
- '<link rel=stylesheet href="" +
- '<img src="" +
- '<video><source src="" +
- '<track kind=subtitles src="" srclang=en>' +
- '</video>' +
- '<style>' +
- ' @font-face { font-family:ahem; src: url(../../non-existent/Ahem.ttf); }' +
- ' span { font-family: ahem, Arial; }' +
- '</style>' +
- '<span>This test makes sure that link preload triggers error events for non-existing resources.</span>');
- var xhr = new XMLHttpRequest();
- xhr.open("GET", "../non-existent/dummy.xml");
- xhr.send();
- var xhr2 = new XMLHttpRequest();
- xhr2.open("GET", "http://127.0.0.1:9999/non-existent/dummy.xml");
- xhr2.send();
function test() {
- assert_true(styleFailed);
- assert_true(scriptFailed);
- assert_true(imageFailed);
- assert_true(fontFailed);
- assert_true(trackFailed);
- assert_true(gibrishFailed);
- assert_true(noTypeFailed);
- t.done();
+ shouldBeTrue("styleFailed");
+ shouldBeTrue("scriptFailed");
+ shouldBeTrue("imageFailed");
+ shouldBeTrue("fontFailed");
+ shouldBeTrue("trackFailed");
+ shouldBeTrue("gibrishFailed");
+ shouldBeTrue("noTypeFailed");
+ if (window.testRunner)
+ testRunner.notifyDone();
};
- setInterval(t.step_func(function() {
+ setInterval(function() {
if (window.counter >= 7)
test();
- }, 100));
+ }, 100);
</script>
Modified: trunk/LayoutTests/http/tests/preload/onload_event-expected.txt (214387 => 214388)
--- trunk/LayoutTests/http/tests/preload/onload_event-expected.txt 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/LayoutTests/http/tests/preload/onload_event-expected.txt 2017-03-25 00:10:06 UTC (rev 214388)
@@ -15,4 +15,4 @@
PASS xsltErrored is true
PASS noTypeLoaded is true
PASS emptyTypeLoaded is true
-This test makes sure that link preload events are fired
+
Modified: trunk/LayoutTests/http/tests/preload/onload_event.html (214387 => 214388)
--- trunk/LayoutTests/http/tests/preload/onload_event.html 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/LayoutTests/http/tests/preload/onload_event.html 2017-03-25 00:10:06 UTC (rev 214388)
@@ -29,7 +29,7 @@
<link rel=preload href="" as=image _onload_="count(); imageLoaded = true;" _onerror_="count()">
<link rel=preload href="" as=font crossorigin _onload_="count(); fontLoaded = true;" _onerror_="count()">
<link rel=preload href="" as=media _onload_="count(); mediaLoaded = true;" _onerror_="count()">
-<link rel=preload href="" as=track _onload_="count(); trackLoaded = true;" _onerror_="count();">
+<link rel=preload href="" as=track _onload_="count(); trackLoaded = true;" _onerror_="count()">
<link rel=preload href="" as=foobarxmlthing _onload_="count(); gibberishLoaded = true;" _onerror_="count(); gibberishErrored = true;">
<link rel=preload href="" as=xslt _onload_="count(); xsltLoaded = true;" _onerror_="count(); xsltErrored = true;">
<link rel=preload href="" _onload_="count(); noTypeLoaded = true;" _onerror_="count()">
@@ -51,24 +51,7 @@
if (window.testRunner)
testRunner.notifyDone();
}
- document.write('<script src="" + 'ipt>' +
- '<link rel=stylesheet href="" +
- '<img src="" +
- '<video><source src="" +
- '<track kind=subtitles src="" srclang=en>' +
- '</video>' +
- '<style>' +
- ' @font-face { font-family:ahem; src: url(../../w3c/webperf/resources/Ahem.ttf); }' +
- ' span { font-family: ahem, Arial; }' +
- '</style>' +
- '<span>This test makes sure that link preload events are fired</span>');
- var xhr = new XMLHttpRequest();
- xhr.open("GET", "../resources/dummy.xml");
- xhr.send();
- var xhr2 = new XMLHttpRequest();
- xhr2.open("GET", "../resources/dummy.xml?badvalue");
- xhr2.send();
- addEventListener("load", function(){
+ addEventListener("load", function(){
setInterval(function() {
if (window.counter >= 10)
test();
Modified: trunk/LayoutTests/http/tests/preload/single_download_preload.html (214387 => 214388)
--- trunk/LayoutTests/http/tests/preload/single_download_preload.html 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/LayoutTests/http/tests/preload/single_download_preload.html 2017-03-25 00:10:06 UTC (rev 214388)
@@ -55,12 +55,6 @@
// FIXME: XHR should trigger a single download, but it downloads 2 resources instead.
verifyDownloadNumber("http://127.0.0.1:8000/resources/dummy.xml", 2);
// FIXME: We should verify for video and audio as well, but they seem to (flakily?) trigger multiple partial requests.
- var xhr = new XMLHttpRequest();
- xhr.open("GET", "../resources/dummy.xml");
- xhr.send();
- var xhr2 = new XMLHttpRequest();
- xhr2.open("GET", "../resources/dummy.xml?badvalue");
- xhr2.send();
t.done();
}), 100);
}));
Deleted: trunk/LayoutTests/http/tests/preload/unused_preload_warning-expected.txt (214387 => 214388)
--- trunk/LayoutTests/http/tests/preload/unused_preload_warning-expected.txt 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/LayoutTests/http/tests/preload/unused_preload_warning-expected.txt 2017-03-25 00:10:06 UTC (rev 214388)
@@ -1,2 +0,0 @@
-CONSOLE MESSAGE: The resource http://127.0.0.1:8000/resources/square100.png?name=value was preloaded using link preload but not used within a few seconds from the window's load event. Please make sure it wasn't preloaded for nothing.
- This test verifies that unused preload resources (and only unused ones) issue a warning.
Deleted: trunk/LayoutTests/http/tests/preload/unused_preload_warning.html (214387 => 214388)
--- trunk/LayoutTests/http/tests/preload/unused_preload_warning.html 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/LayoutTests/http/tests/preload/unused_preload_warning.html 2017-03-25 00:10:06 UTC (rev 214388)
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<script>
- if (window.testRunner) {
- testRunner.waitUntilDone();
- testRunner.dumpAsText();
- }
- window._onload_ = function() {
- window.setTimeout(function() {
- if (window.testRunner)
- testRunner.notifyDone();
- }, 4000);
- };
-</script>
-<link rel="preload" as="image" href=""
-<link rel="preload" as="image" href=""
-<img src=""
-This test verifies that unused preload resources (and only unused ones) issue a warning.
Modified: trunk/Source/WebCore/ChangeLog (214387 => 214388)
--- trunk/Source/WebCore/ChangeLog 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/Source/WebCore/ChangeLog 2017-03-25 00:10:06 UTC (rev 214388)
@@ -1,3 +1,15 @@
+2017-03-24 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r214361.
+
+ This change caused flakiness in http/tests/preload tests.
+
+ Reverted changeset:
+
+ "Add a warning for unused link preloads."
+ https://bugs.webkit.org/show_bug.cgi?id=165670
+ http://trac.webkit.org/changeset/214361
+
2017-03-24 Antoine Quint <[email protected]>
[Modern Media Controls] Remove placard icon if height is compressed
Modified: trunk/Source/WebCore/dom/Document.cpp (214387 => 214388)
--- trunk/Source/WebCore/dom/Document.cpp 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-03-25 00:10:06 UTC (rev 214388)
@@ -2280,8 +2280,6 @@
}
#endif
- m_cachedResourceLoader->stopUnusedPreloadsTimer();
-
detachFromFrame();
m_hasPreparedForDestruction = true;
Modified: trunk/Source/WebCore/loader/LinkPreloadResourceClients.h (214387 => 214388)
--- trunk/Source/WebCore/loader/LinkPreloadResourceClients.h 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/Source/WebCore/loader/LinkPreloadResourceClients.h 2017-03-25 00:10:06 UTC (rev 214388)
@@ -88,7 +88,6 @@
void notifyFinished(CachedResource& resource) override { triggerEvents(resource); }
void clear() override { clearResource(*this); }
- bool shouldMarkAsReferenced() const override { return false; }
private:
LinkPreloadScriptResourceClient(LinkLoader& loader, CachedScript& resource)
@@ -115,7 +114,6 @@
}
void clear() override { clearResource(*this); }
- bool shouldMarkAsReferenced() const override { return false; }
private:
LinkPreloadStyleResourceClient(LinkLoader& loader, CachedCSSStyleSheet& resource)
@@ -137,7 +135,6 @@
void notifyFinished(CachedResource& resource) override { triggerEvents(resource); }
void clear() override { clearResource(*this); }
- bool shouldMarkAsReferenced() const override { return false; }
private:
LinkPreloadImageResourceClient(LinkLoader& loader, CachedImage& resource)
@@ -163,7 +160,6 @@
}
void clear() override { clearResource(*this); }
- bool shouldMarkAsReferenced() const override { return false; }
private:
LinkPreloadFontResourceClient(LinkLoader& loader, CachedFont& resource)
@@ -185,7 +181,6 @@
void notifyFinished(CachedResource& resource) override { triggerEvents(resource); }
void clear() override { clearResource(*this); }
- bool shouldMarkAsReferenced() const override { return false; }
private:
LinkPreloadRawResourceClient(LinkLoader& loader, CachedRawResource& resource)
Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (214387 => 214388)
--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2017-03-25 00:10:06 UTC (rev 214388)
@@ -465,7 +465,7 @@
bool CachedResource::addClientToSet(CachedResourceClient& client)
{
- if (m_preloadResult == PreloadNotReferenced && client.shouldMarkAsReferenced()) {
+ if (m_preloadResult == PreloadNotReferenced) {
if (isLoaded())
m_preloadResult = PreloadReferencedWhileComplete;
else if (m_requestedFromNetworkingLayer)
Modified: trunk/Source/WebCore/loader/cache/CachedResourceClient.h (214387 => 214388)
--- trunk/Source/WebCore/loader/cache/CachedResourceClient.h 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/Source/WebCore/loader/cache/CachedResourceClient.h 2017-03-25 00:10:06 UTC (rev 214388)
@@ -45,7 +45,6 @@
static CachedResourceClientType expectedType() { return BaseResourceType; }
virtual CachedResourceClientType resourceClientType() const { return expectedType(); }
- virtual bool shouldMarkAsReferenced() const { return true; }
protected:
CachedResourceClient() { }
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (214387 => 214388)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2017-03-25 00:10:06 UTC (rev 214388)
@@ -85,9 +85,6 @@
namespace WebCore {
-// Timeout for link preloads to be used after window.onload
-static const int unusedPreloadTimeoutInSeconds = 3;
-
static CachedResource* createResource(CachedResource::Type type, CachedResourceRequest&& request, SessionID sessionID)
{
switch (type) {
@@ -132,7 +129,6 @@
: m_document(nullptr)
, m_documentLoader(documentLoader)
, m_requestCount(0)
- , m_unusedPreloadsTimer(*this, &CachedResourceLoader::warnUnusedPreloads)
, m_garbageCollectDocumentResourcesTimer(*this, &CachedResourceLoader::garbageCollectDocumentResources)
, m_autoLoadImages(true)
, m_imagesEnabled(true)
@@ -151,7 +147,6 @@
// Make sure no requests still point to this CachedResourceLoader
ASSERT(m_requestCount == 0);
- m_unusedPreloadsTimer.stop();
}
CachedResource* CachedResourceLoader::cachedResource(const String& resourceURL) const
@@ -826,18 +821,8 @@
void CachedResourceLoader::documentDidFinishLoadEvent()
{
m_validatedURLs.clear();
-
- // If m_preloads is not empty here, it's full of link preloads,
- // as speculative preloads were cleared at DCL.
- if (m_preloads && m_preloads->size() && !m_unusedPreloadsTimer.isActive())
- m_unusedPreloadsTimer.startOneShot(unusedPreloadTimeoutInSeconds);
}
-void CachedResourceLoader::stopUnusedPreloadsTimer()
-{
- m_unusedPreloadsTimer.stop();
-}
-
CachedResourceHandle<CachedResource> CachedResourceLoader::revalidateResource(CachedResourceRequest&& request, CachedResource& resource)
{
ASSERT(resource.inCache());
@@ -1243,19 +1228,6 @@
return resource;
}
-void CachedResourceLoader::warnUnusedPreloads()
-{
- if (!m_preloads)
- return;
- for (const auto& resource : *m_preloads) {
- if (resource && resource->isLinkPreload() && resource->preloadResult() == CachedResource::PreloadNotReferenced && document()) {
- document()->addConsoleMessage(MessageSource::Other, MessageLevel::Warning,
- "The resource " + resource->url().string() +
- " was preloaded using link preload but not used within a few seconds from the window's load event. Please make sure it wasn't preloaded for nothing.");
- }
- }
-}
-
bool CachedResourceLoader::isPreloaded(const String& urlString) const
{
const URL& url = ""
Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.h (214387 => 214388)
--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2017-03-24 23:43:56 UTC (rev 214387)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.h 2017-03-25 00:10:06 UTC (rev 214388)
@@ -133,8 +133,6 @@
void clearPreloads(ClearPreloadsMode);
CachedResourceHandle<CachedResource> preload(CachedResource::Type, CachedResourceRequest&&);
void printPreloadStats();
- void warnUnusedPreloads();
- void stopUnusedPreloadsTimer();
bool updateRequestAfterRedirection(CachedResource::Type, ResourceRequest&, const ResourceLoaderOptions&);
@@ -190,7 +188,6 @@
int m_requestCount;
std::unique_ptr<ListHashSet<CachedResource*>> m_preloads;
- Timer m_unusedPreloadsTimer;
Timer m_garbageCollectDocumentResourcesTimer;
