Changeset 224697 in webkit


Ignore:
Timestamp:
Nov 10, 2017 11:01:39 AM (6 years ago)
Author:
commit-queue@webkit.org
Message:

Fix race conditions with setBackingScaleFactor, page refresh and preloader
​https://bugs.webkit.org/show_bug.cgi?id=179488

Patch by Colin Bendell <colin> 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

Location:
trunk/LayoutTests
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r224690 r224697  
     12017-11-10  Colin Bendell  <colin@bendell.ca>
     2
     3        Fix race conditions with setBackingScaleFactor, page refresh and preloader
     4        https://bugs.webkit.org/show_bug.cgi?id=179488
     5
     6        Reviewed by Darin Adler.
     7
     8        * http/tests/preload/picture-type-expected.txt: remove DPR test
     9        * http/tests/preload/picture-type.html: updated srcset to account for
     10        testRunners with DPR > 1
     11
    1122017-11-10  Ryan Haddad  <ryanhaddad@apple.com>
    213

  • trunk/LayoutTests/http/tests/preload/picture-type-expected.txt

    r224602 r224697  
    1 PASS window.devicePixelRatio is 1
    21PASS internals.isPreloaded('resources/base-image1.png?0'); is true
    32PASS internals.isPreloaded('resources/preload-test.jpg?0'); is false

  • trunk/LayoutTests/http/tests/preload/picture-type.html

    r224602 r224697  
    11<html>
    22<head>
    3     <script>
    4         if (window.testRunner) {
    5             testRunner.dumpAsText();
    6             testRunner.waitUntilDone();
    7             testRunner.setBackingScaleFactor(1);
    8             if (!sessionStorage.pageReloaded) {
    9                 sessionStorage.pageReloaded = true;
    10                 // have to force a restart because of a bug in dynamic changes with srcset
    11                 // we have to force the restart even if DPR=1 for consistency
    12               setTimeout(function() {document.location.reload(true)}, 0);
    13             }
    14         }
    15     </script>
    163    <script src="/js-test-resources/js-test.js"></script>
    174    <script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=100"></script>
    … …  
    207<script>
    218    if (window.testRunner && window.internals) {
    22         shouldBe("window.devicePixelRatio", "1");
     9        testRunner.dumpAsText();
     10
    2311        shouldBeTrue("internals.isPreloaded('resources/base-image1.png?0');");
    2412        shouldBeFalse("internals.isPreloaded('resources/preload-test.jpg?0');");
    … …  
    6654        shouldBeFalse("internals.isPreloaded('resources/base-image2.png?13');");
    6755        shouldBeTrue("internals.isPreloaded('resources/preload-test.jpg?13');");
    68 
    69         delete sessionStorage.pageReloaded;
    70         testRunner.notifyDone();
    7156    }
    7257</script>
    … …  
    9176</picture>
    9277<picture>
    93     <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">
     78    <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">
    9479    <img src="resources/preload-test.jpg?4">
    9580</picture>
    9681<picture>
    97     <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" >
     82    <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" >
    9883    <img src="resources/preload-test.jpg?5">
    9984</picture>
Note: See TracChangeset for help on using the changeset viewer.