Title: [224697] trunk/LayoutTests
- Revision
- 224697
- Author
- commit-qu...@webkit.org
- Date
- 2017-11-10 11:01:39 -0800 (Fri, 10 Nov 2017)
Log Message
Fix race conditions with setBackingScaleFactor, page refresh and preloader
https://bugs.webkit.org/show_bug.cgi?id=179488
Patch by Colin Bendell <co...@bendell.ca> on 2017-11-10
Reviewed by Darin Adler.
* http/tests/preload/picture-type-expected.txt: remove DPR test
* http/tests/preload/picture-type.html: updated srcset to account for
testRunners with DPR > 1
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (224696 => 224697)
--- trunk/LayoutTests/ChangeLog 2017-11-10 18:45:32 UTC (rev 224696)
+++ trunk/LayoutTests/ChangeLog 2017-11-10 19:01:39 UTC (rev 224697)
@@ -1,3 +1,14 @@
+2017-11-10 Colin Bendell <co...@bendell.ca>
+
+ Fix race conditions with setBackingScaleFactor, page refresh and preloader
+ https://bugs.webkit.org/show_bug.cgi?id=179488
+
+ Reviewed by Darin Adler.
+
+ * http/tests/preload/picture-type-expected.txt: remove DPR test
+ * http/tests/preload/picture-type.html: updated srcset to account for
+ testRunners with DPR > 1
+
2017-11-10 Ryan Haddad <ryanhad...@apple.com>
Mark http/wpt/beacon/contentextensions tests as flaky.
Modified: trunk/LayoutTests/http/tests/preload/picture-type-expected.txt (224696 => 224697)
--- trunk/LayoutTests/http/tests/preload/picture-type-expected.txt 2017-11-10 18:45:32 UTC (rev 224696)
+++ trunk/LayoutTests/http/tests/preload/picture-type-expected.txt 2017-11-10 19:01:39 UTC (rev 224697)
@@ -1,4 +1,3 @@
-PASS window.devicePixelRatio is 1
PASS internals.isPreloaded('resources/base-image1.png?0'); is true
PASS internals.isPreloaded('resources/preload-test.jpg?0'); is false
PASS internals.isPreloaded('resources/base-image1.png?1'); is true
Modified: trunk/LayoutTests/http/tests/preload/picture-type.html (224696 => 224697)
--- trunk/LayoutTests/http/tests/preload/picture-type.html 2017-11-10 18:45:32 UTC (rev 224696)
+++ trunk/LayoutTests/http/tests/preload/picture-type.html 2017-11-10 19:01:39 UTC (rev 224697)
@@ -1,18 +1,5 @@
<html>
<head>
- <script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.waitUntilDone();
- testRunner.setBackingScaleFactor(1);
- if (!sessionStorage.pageReloaded) {
- sessionStorage.pageReloaded = true;
- // have to force a restart because of a bug in dynamic changes with srcset
- // we have to force the restart even if DPR=1 for consistency
- setTimeout(function() {document.location.reload(true)}, 0);
- }
- }
- </script>
<script src=""
<script src=""
</head>
@@ -19,7 +6,8 @@
<body>
<script>
if (window.testRunner && window.internals) {
- shouldBe("window.devicePixelRatio", "1");
+ testRunner.dumpAsText();
+
shouldBeTrue("internals.isPreloaded('resources/base-image1.png?0');");
shouldBeFalse("internals.isPreloaded('resources/preload-test.jpg?0');");
shouldBeTrue("internals.isPreloaded('resources/base-image1.png?1');");
@@ -65,9 +53,6 @@
shouldBeFalse("internals.isPreloaded('resources/base-image1.png?13');");
shouldBeFalse("internals.isPreloaded('resources/base-image2.png?13');");
shouldBeTrue("internals.isPreloaded('resources/preload-test.jpg?13');");
-
- delete sessionStorage.pageReloaded;
- testRunner.notifyDone();
}
</script>
<!-- Control group -->
@@ -90,11 +75,11 @@
<img src=""
</picture>
<picture>
- <source type="image/png" sizes="400px" srcset="resources/base-image1.png?4 200w, resources/base-image3.png?4 400w, resources/base-image2.png?4 800w">
+ <source type="image/png" sizes="200px" srcset="resources/base-image1.png?4 100w, resources/base-image3.png?4 800w, resources/base-image2.png?4 1000w">
<img src=""
</picture>
<picture>
- <source type="image/bad" sizes="400px" srcset="resources/base-image1.png?5 200w, resources/base-image3.png?5 400w, resources/base-image2.png?5 800w" >
+ <source type="image/bad" sizes="200px" srcset="resources/base-image1.png?5 100w, resources/base-image3.png?5 800w, resources/base-image2.png?5 1000w" >
<img src=""
</picture>
<picture>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
