Attachment 326463 Details for Bug 179488 – Patch

[patch] Patch

bug-179488-20171109130656.patch (text/plain), 3.99 KB, created by Colin Bendell on 2017-11-09 10:06:57 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Bendell

Created: 2017-11-09 10:06:57 PST

Size: 3.99 KB

patch

obsolete

>Subversion Revision: 224628
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 8585446f89a04e95260eb7fae292c12380307e08..6f2fef7523683a677274f15092028754445a268e 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,14 @@
>+2017-11-09  Colin Bendell  <colin@bendell.ca>
>+
>+        Fix race conditions with setBackingScaleFactor, page refresh and preloader
>+        https://bugs.webkit.org/show_bug.cgi?id=179488
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * 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-09  Carlos Alberto Lopez Perez  <clopez@igalia.com>
> 
>         [GTK] Gardening 09 nov
>diff --git a/LayoutTests/http/tests/preload/picture-type-expected.txt b/LayoutTests/http/tests/preload/picture-type-expected.txt
>index d01a805cf4d1938a039c4c6b1d83777c8ed92e48..ee3b68566d6ab9758ef58b1068b26f8c68776c60 100644
>--- a/LayoutTests/http/tests/preload/picture-type-expected.txt
>+++ b/LayoutTests/http/tests/preload/picture-type-expected.txt
>@@ -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
>diff --git a/LayoutTests/http/tests/preload/picture-type.html b/LayoutTests/http/tests/preload/picture-type.html
>index f7c86b91988d51dfe8ff3c0ae9d9a37f74dd0929..1291240b6072d1a20e65cdc6bfdf93a0f54053c6 100644
>--- a/LayoutTests/http/tests/preload/picture-type.html
>+++ b/LayoutTests/http/tests/preload/picture-type.html
>@@ -1,25 +1,13 @@
> <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="/js-test-resources/js-test.js"></script>
>     <script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=100"></script>
> </head>
> <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>
> 
>@@ -90,11 +75,11 @@
>     <img src="resources/preload-test.jpg?3">
> </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="resources/preload-test.jpg?4">
> </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="resources/preload-test.jpg?5">
> </picture>
> <picture>

Actions: View | Formatted Diff | Diff

Attachments on bug 179488: 326463