Changeset 256055 in webkit


Ignore:
Timestamp:
Feb 7, 2020 1:29:34 PM (4 years ago)
Author:
Kate Cheney
Message:

Regression (r256011): http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access.html is consistently failing
https://bugs.webkit.org/show_bug.cgi?id=207382
<rdar://problem/59259844>

Source/WebKit:

Sort the resource load statistics dumping results so they consistently
print in the same order.

Reviewed by Yusuke Suzuki.

  • NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:

(WebKit::ResourceLoadStatisticsMemoryStore::dumpResourceLoadStatistics):

LayoutTests:

Reviewed by Yusuke Suzuki.

Updated test expectations to reflect new sorting.

  • http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access-expected.txt:
  • http/tests/resourceLoadStatistics/count-third-party-script-import-in-worker-expected.txt:
  • http/tests/resourceLoadStatistics/count-third-party-script-loads-expected.txt:
  • http/tests/resourceLoadStatistics/log-delayed-client-side-redirects-expected.txt:
  • http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration-expected.txt:
  • http/tests/storageAccess/aggregate-sorted-data-with-storage-access-expected.txt:
Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r256053 r256055  
     12020-02-07  Kate Cheney  <katherine_cheney@apple.com>
     2
     3       Regression (r256011): http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access.html is consistently failing
     4       https://bugs.webkit.org/show_bug.cgi?id=207382
     5       <rdar://problem/59259844>
     6
     7        Reviewed by Yusuke Suzuki.
     8
     9        Updated test expectations to reflect new sorting.
     10
     11        * http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access-expected.txt:
     12        * http/tests/resourceLoadStatistics/count-third-party-script-import-in-worker-expected.txt:
     13        * http/tests/resourceLoadStatistics/count-third-party-script-loads-expected.txt:
     14        * http/tests/resourceLoadStatistics/log-delayed-client-side-redirects-expected.txt:
     15        * http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration-expected.txt:
     16        * http/tests/storageAccess/aggregate-sorted-data-with-storage-access-expected.txt:
     17
    1182020-02-07  Jacob Uphoff  <jacob_uphoff@apple.com>
    219
  • trunk/LayoutTests/http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access-expected.txt

    r255889 r256055  
    55Resource load statistics:
    66
    7 Registrable domain: subframe3
    8     hadUserInteraction: No
    9     mostRecentUserInteraction: -1
    10     grandfathered: No
    11     gotLinkDecorationFromPrevalentResource: No
    12     subframeUnderTopFrameDomains:
    13         topframe1
    14         topframe4
    15     subresourceUnderTopFrameDomains:
    16         topframe3
    17     subresourceUniqueRedirectsTo:
    18         topframe2
    19     isPrevalentResource: Yes
    20     isVeryPrevalentResource: No
    21     dataRecordsRemoved: 0
    22 Registrable domain: topframe2
    23     hadUserInteraction: No
    24     mostRecentUserInteraction: -1
    25     grandfathered: No
    26     gotLinkDecorationFromPrevalentResource: No
    27     isPrevalentResource: No
    28     isVeryPrevalentResource: No
    29     dataRecordsRemoved: 0
    30 Registrable domain: topframe1
    31     hadUserInteraction: No
    32     mostRecentUserInteraction: -1
    33     grandfathered: No
    34     gotLinkDecorationFromPrevalentResource: No
    35     isPrevalentResource: No
    36     isVeryPrevalentResource: No
    37     dataRecordsRemoved: 0
    38 Registrable domain: topframe4
    39     hadUserInteraction: No
    40     mostRecentUserInteraction: -1
    41     grandfathered: No
    42     gotLinkDecorationFromPrevalentResource: No
    43     isPrevalentResource: No
    44     isVeryPrevalentResource: No
    45     dataRecordsRemoved: 0
    467Registrable domain: subframe1
    478    hadUserInteraction: No
     
    6627    isVeryPrevalentResource: No
    6728    dataRecordsRemoved: 0
     29Registrable domain: subframe3
     30    hadUserInteraction: No
     31    mostRecentUserInteraction: -1
     32    grandfathered: No
     33    gotLinkDecorationFromPrevalentResource: No
     34    subframeUnderTopFrameDomains:
     35        topframe1
     36        topframe4
     37    subresourceUnderTopFrameDomains:
     38        topframe3
     39    subresourceUniqueRedirectsTo:
     40        topframe2
     41    isPrevalentResource: Yes
     42    isVeryPrevalentResource: No
     43    dataRecordsRemoved: 0
     44Registrable domain: topframe1
     45    hadUserInteraction: No
     46    mostRecentUserInteraction: -1
     47    grandfathered: No
     48    gotLinkDecorationFromPrevalentResource: No
     49    isPrevalentResource: No
     50    isVeryPrevalentResource: No
     51    dataRecordsRemoved: 0
     52Registrable domain: topframe2
     53    hadUserInteraction: No
     54    mostRecentUserInteraction: -1
     55    grandfathered: No
     56    gotLinkDecorationFromPrevalentResource: No
     57    isPrevalentResource: No
     58    isVeryPrevalentResource: No
     59    dataRecordsRemoved: 0
    6860Registrable domain: topframe3
     61    hadUserInteraction: No
     62    mostRecentUserInteraction: -1
     63    grandfathered: No
     64    gotLinkDecorationFromPrevalentResource: No
     65    isPrevalentResource: No
     66    isVeryPrevalentResource: No
     67    dataRecordsRemoved: 0
     68Registrable domain: topframe4
    6969    hadUserInteraction: No
    7070    mostRecentUserInteraction: -1
  • trunk/LayoutTests/http/tests/resourceLoadStatistics/count-third-party-script-import-in-worker-expected.txt

    r253697 r256055  
    55Resource load statistics:
    66
     7Registrable domain: 127.0.0.1
     8    hadUserInteraction: No
     9    mostRecentUserInteraction: -1
     10    grandfathered: No
     11    gotLinkDecorationFromPrevalentResource: No
     12    topFrameLoadedThirdPartyScripts:
     13        localhost
     14    isPrevalentResource: No
     15    isVeryPrevalentResource: No
     16    dataRecordsRemoved: 0
    717Registrable domain: localhost
    818    hadUserInteraction: No
     
    1525    isVeryPrevalentResource: No
    1626    dataRecordsRemoved: 0
    17 Registrable domain: 127.0.0.1
    18     hadUserInteraction: No
    19     mostRecentUserInteraction: -1
    20     grandfathered: No
    21     gotLinkDecorationFromPrevalentResource: No
    22     topFrameLoadedThirdPartyScripts:
    23         localhost
    24     isPrevalentResource: No
    25     isVeryPrevalentResource: No
    26     dataRecordsRemoved: 0
  • trunk/LayoutTests/http/tests/resourceLoadStatistics/count-third-party-script-loads-expected.txt

    r253697 r256055  
    55Resource load statistics:
    66
     7Registrable domain: 127.0.0.1
     8    hadUserInteraction: No
     9    mostRecentUserInteraction: -1
     10    grandfathered: No
     11    gotLinkDecorationFromPrevalentResource: No
     12    topFrameLoadedThirdPartyScripts:
     13        localhost
     14    isPrevalentResource: No
     15    isVeryPrevalentResource: No
     16    dataRecordsRemoved: 0
    717Registrable domain: localhost
    818    hadUserInteraction: No
     
    1525    isVeryPrevalentResource: No
    1626    dataRecordsRemoved: 0
    17 Registrable domain: 127.0.0.1
    18     hadUserInteraction: No
    19     mostRecentUserInteraction: -1
    20     grandfathered: No
    21     gotLinkDecorationFromPrevalentResource: No
    22     topFrameLoadedThirdPartyScripts:
    23         localhost
    24     isPrevalentResource: No
    25     isVeryPrevalentResource: No
    26     dataRecordsRemoved: 0
  • trunk/LayoutTests/http/tests/resourceLoadStatistics/log-delayed-client-side-redirects-expected.txt

    r254296 r256055  
    33Resource load statistics:
    44
     5Registrable domain: 127.0.0.1
     6    hadUserInteraction: No
     7    mostRecentUserInteraction: -1
     8    grandfathered: No
     9    topFrameUniqueRedirectsTo:
     10        localhost
     11    gotLinkDecorationFromPrevalentResource: No
     12    isPrevalentResource: No
     13    isVeryPrevalentResource: No
     14    dataRecordsRemoved: 0
    515Registrable domain: localhost
    616    hadUserInteraction: No
     
    1323    isVeryPrevalentResource: No
    1424    dataRecordsRemoved: 0
    15 Registrable domain: 127.0.0.1
    16     hadUserInteraction: No
    17     mostRecentUserInteraction: -1
    18     grandfathered: No
    19     topFrameUniqueRedirectsTo:
    20         localhost
    21     gotLinkDecorationFromPrevalentResource: No
    22     isPrevalentResource: No
    23     isVeryPrevalentResource: No
    24     dataRecordsRemoved: 0
  • trunk/LayoutTests/http/tests/resourceLoadStatistics/website-data-removal-for-site-navigated-to-with-link-decoration-expected.txt

    r252641 r256055  
    1616Resource load statistics:
    1717
    18 Registrable domain: localhost
    19     hadUserInteraction: No
    20     mostRecentUserInteraction: -1
    21     grandfathered: No
    22     gotLinkDecorationFromPrevalentResource: No
    23     isPrevalentResource: Yes
    24     isVeryPrevalentResource: No
    25     dataRecordsRemoved: 0
    2618Registrable domain: 127.0.0.1
    2719    hadUserInteraction: No
     
    3426    isVeryPrevalentResource: No
    3527    dataRecordsRemoved: 1
     28Registrable domain: localhost
     29    hadUserInteraction: No
     30    mostRecentUserInteraction: -1
     31    grandfathered: No
     32    gotLinkDecorationFromPrevalentResource: No
     33    isPrevalentResource: Yes
     34    isVeryPrevalentResource: No
     35    dataRecordsRemoved: 0
  • trunk/LayoutTests/http/tests/storageAccess/aggregate-sorted-data-with-storage-access-expected.txt

    r254296 r256055  
    1111Resource load statistics:
    1212
     13Registrable domain: 127.0.0.1
     14    hadUserInteraction: Yes
     15    mostRecentUserInteraction: within 24 hours
     16    grandfathered: No
     17    topFrameUniqueRedirectsTo:
     18        localhost
     19    topFrameUniqueRedirectsFrom:
     20        localhost
     21    gotLinkDecorationFromPrevalentResource: No
     22    isPrevalentResource: Yes
     23    isVeryPrevalentResource: No
     24    dataRecordsRemoved: 0
    1325Registrable domain: localhost
    1426    hadUserInteraction: Yes
     
    2739    isVeryPrevalentResource: No
    2840    dataRecordsRemoved: 0
    29 Registrable domain: 127.0.0.1
    30     hadUserInteraction: Yes
    31     mostRecentUserInteraction: within 24 hours
    32     grandfathered: No
    33     topFrameUniqueRedirectsTo:
    34         localhost
    35     topFrameUniqueRedirectsFrom:
    36         localhost
    37     gotLinkDecorationFromPrevalentResource: No
    38     isPrevalentResource: Yes
    39     isVeryPrevalentResource: No
    40     dataRecordsRemoved: 0
    4141
    4242ITP Data:
  • trunk/Source/WebKit/ChangeLog

    r256051 r256055  
     12020-02-07  Kate Cheney  <katherine_cheney@apple.com>
     2
     3       Regression (r256011): http/tests/resourceLoadStatistics/aggregate-sorted-data-no-storage-access.html is consistently failing
     4       https://bugs.webkit.org/show_bug.cgi?id=207382
     5       <rdar://problem/59259844>
     6
     7       Sort the resource load statistics dumping results so they consistently
     8       print in the same order.
     9
     10        Reviewed by Yusuke Suzuki.
     11
     12        * NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp:
     13        (WebKit::ResourceLoadStatisticsMemoryStore::dumpResourceLoadStatistics):
     14
    1152020-02-07  Sam Weinig  <weinig@apple.com>
    216
  • trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsMemoryStore.cpp

    r254296 r256055  
    552552    StringBuilder result;
    553553    result.appendLiteral("Resource load statistics:\n\n");
     554    Vector<String> sortedMapEntries;
    554555    for (auto& mapEntry : m_resourceStatisticsMap.values())
    555         result.append(mapEntry.toString());
    556 
     556        sortedMapEntries.append(mapEntry.toString());
     557
     558    std::sort(sortedMapEntries.begin(), sortedMapEntries.end(), WTF::codePointCompareLessThan);
     559
     560    for (auto& entry : sortedMapEntries)
     561        result.append(entry);
     562   
    557563    auto thirdPartyData = aggregatedThirdPartyData();
    558564    if (!thirdPartyData.isEmpty()) {
Note: See TracChangeset for help on using the changeset viewer.