Title: [201447] trunk
Revision
201447
Author
[email protected]
Date
2016-05-26 22:43:52 -0700 (Thu, 26 May 2016)

Log Message

Preload single download tests.
https://bugs.webkit.org/show_bug.cgi?id=157988

Reviewed by Alex Christensen.

Source/WebCore:

ResourceTiming entries for some subresource weren't registered as resource->response().isHTTP() was false, since
resource->response().url() was empty. I switched the check to use resource->resourceRequest().url() directly instead.

Test: http/tests/preload/single_download_preload_runner.html

* loader/ResourceTimingInformation.cpp:
(WebCore::ResourceTimingInformation::addResourceTiming):

LayoutTests:

Make sure preload is only downloading a single resource, which is properly reused.

* http/tests/preload/resources/single_download_preload.html: Added.
* http/tests/preload/single_download_preload_runner-expected.txt: Added.
* http/tests/preload/single_download_preload_runner.html: Added.

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (201446 => 201447)


--- trunk/LayoutTests/ChangeLog	2016-05-27 05:40:15 UTC (rev 201446)
+++ trunk/LayoutTests/ChangeLog	2016-05-27 05:43:52 UTC (rev 201447)
@@ -1,3 +1,16 @@
+2016-05-26  Yoav Weiss  <[email protected]>
+
+        Preload single download tests.
+        https://bugs.webkit.org/show_bug.cgi?id=157988
+
+        Reviewed by Alex Christensen.
+
+        Make sure preload is only downloading a single resource, which is properly reused.
+
+        * http/tests/preload/resources/single_download_preload.html: Added.
+        * http/tests/preload/single_download_preload_runner-expected.txt: Added.
+        * http/tests/preload/single_download_preload_runner.html: Added.
+
 2016-05-26  Gyuyoung Kim  <[email protected]>
 
         Unreviewed EFL gardening.

Added: trunk/LayoutTests/http/tests/preload/resources/single_download_preload.html (0 => 201447)


--- trunk/LayoutTests/http/tests/preload/resources/single_download_preload.html	                        (rev 0)
+++ trunk/LayoutTests/http/tests/preload/resources/single_download_preload.html	2016-05-27 05:43:52 UTC (rev 201447)
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<link rel=preload href="" as=script>
+<link rel=preload href="" as=style>
+<link rel=preload href="" as=image>
+<link rel=preload href="" as=image>
+<link rel=preload href="" as=font crossorigin>
+<link rel=preload href="" as=media>
+<link rel=preload href="" as=media>
+<link rel=preload href="" as=track>
+<link rel=preload href="" as=foobarxmlthing>
+<link rel=preload href=""
+<script src=""
+<style>
+    #background {
+        width: 200px;
+        height: 200px;
+        background-image: url(../../resources/square100.png?background);
+    }
+    @font-face {
+      font-family:ahem;
+      src: url(../../w3c/webperf/resources/Ahem.ttf);
+    }
+    span { font-family: ahem, Arial; }
+</style>
+<link rel="stylesheet" href=""
+<script src=""
+<div id="background"></div>
+<img src=""
+<video src=""
+    <track kind=subtitles src="" srclang=en>
+</video>
+<audio src=""
+<script>
+    var xhr = new XMLHttpRequest();
+    xhr.open("GET", "../../resources/dummy.xml");
+    xhr.send();
+
+    window.addEventListener("load", function() {
+        var entries = performance.getEntriesByType("resource");
+        message = performance.getEntriesByType("resource").length;
+        parent.postMessage(message, "*");
+    });
+</script>
+<span>this text is here just so that the browser will download the font.</span>

Added: trunk/LayoutTests/http/tests/preload/single_download_preload_runner-expected.txt (0 => 201447)


--- trunk/LayoutTests/http/tests/preload/single_download_preload_runner-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/http/tests/preload/single_download_preload_runner-expected.txt	2016-05-27 05:43:52 UTC (rev 201447)
@@ -0,0 +1,5 @@
+CONSOLE MESSAGE: line 10: <link rel=preload> must have a valid `as` value
+
+
+PASS Makes sure that preloaded resources are not downloaded again when used 
+

Added: trunk/LayoutTests/http/tests/preload/single_download_preload_runner.html (0 => 201447)


--- trunk/LayoutTests/http/tests/preload/single_download_preload_runner.html	                        (rev 0)
+++ trunk/LayoutTests/http/tests/preload/single_download_preload_runner.html	2016-05-27 05:43:52 UTC (rev 201447)
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<script src=""
+<script src=""
+<script>
+    if (window.internals) {
+        internals.setLinkPreloadSupport(true);
+        internals.setResourceTimingSupport(true);
+    }
+    var t = async_test('Makes sure that preloaded resources are not downloaded again when used');
+
+    window.addEventListener("message", t.step_func(function(event) {
+        var data = ""
+        assert_equals(data, 10, "The number of resource downloads");
+        if (window.internals) {
+            internals.setLinkPreloadSupport(false);
+            internals.setResourceTimingSupport(false);
+        }
+        t.done();
+    }));
+</script>
+<iframe src="" _onerror_="assert_unreached();t.done()"></iframe>

Modified: trunk/Source/WebCore/ChangeLog (201446 => 201447)


--- trunk/Source/WebCore/ChangeLog	2016-05-27 05:40:15 UTC (rev 201446)
+++ trunk/Source/WebCore/ChangeLog	2016-05-27 05:43:52 UTC (rev 201447)
@@ -1,3 +1,18 @@
+2016-05-26  Yoav Weiss  <[email protected]>
+
+        Preload single download tests.
+        https://bugs.webkit.org/show_bug.cgi?id=157988
+
+        Reviewed by Alex Christensen.
+
+        ResourceTiming entries for some subresource weren't registered as resource->response().isHTTP() was false, since
+        resource->response().url() was empty. I switched the check to use resource->resourceRequest().url() directly instead.
+
+        Test: http/tests/preload/single_download_preload_runner.html
+
+        * loader/ResourceTimingInformation.cpp:
+        (WebCore::ResourceTimingInformation::addResourceTiming):
+
 2016-05-26  Nan Wang  <[email protected]>
 
         AX: Wrong CharacterOffset from VisiblePosition with composed characters

Modified: trunk/Source/WebCore/loader/ResourceTimingInformation.cpp (201446 => 201447)


--- trunk/Source/WebCore/loader/ResourceTimingInformation.cpp	2016-05-27 05:40:15 UTC (rev 201446)
+++ trunk/Source/WebCore/loader/ResourceTimingInformation.cpp	2016-05-27 05:43:52 UTC (rev 201447)
@@ -41,7 +41,7 @@
 void ResourceTimingInformation::addResourceTiming(CachedResource* resource, Document* document)
 {
     ASSERT(RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled());
-    if (resource && resource->response().isHTTP()
+    if (resource && resource->resourceRequest().url().protocolIsInHTTPFamily()
         && ((!resource->errorOccurred() && !resource->wasCanceled()) || resource->response().httpStatusCode() == 304)) {
         HashMap<CachedResource*, InitiatorInfo>::iterator initiatorIt = m_initiatorMap.find(resource);
         if (initiatorIt != m_initiatorMap.end() && initiatorIt->value.added == NotYetAdded) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to