Changeset 219323 in webkit

Timestamp:

Jul 10, 2017 9:08:20 PM (7 years ago)

Author:

Brent Fulgham

Message:

Resource Load Statistics: Prune statistics in orders of importance
​https://bugs.webkit.org/show_bug.cgi?id=174215
<rdar://problem/33164403>

Unreviewed test correction.

Source/WebKit2:

• UIProcess/WebResourceLoadStatisticsStore.cpp:

(WebKit::pruneResources): The revised algorithm did not update the remaining
count to be pruned, causing a test failure.

LayoutTests:

Drive-by fix after recent refactoring to correct the new function names in TestRunner.

• http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html:
• http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html (modified) (1 diff)
• LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-07-10  Brent Fulgham  <bfulgham@apple.com>
+
+        Resource Load Statistics: Prune statistics in orders of importance
+        https://bugs.webkit.org/show_bug.cgi?id=174215
+        <rdar://problem/33164403>
+
+        Unreviewed test correction.
+
+        Drive-by fix after recent refactoring to correct the new function names in TestRunner.
+
+        * http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html:
+        * http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html:
+
 2017-07-10  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-and-unpartitioned-cookie-deletion.html

@@ -94 +94 @@
         testRunner.setStatisticsMinimumTimeBetweenDataRecordsRemoval(0);
 
-        testRunner.statisticsUpdateCookiePartitioningForOneDomain("localhost", true);
+        testRunner.statisticsSetShouldPartitionCookiesForHost("localhost", true);
         testRunner.setStatisticsPrevalentResource("http://localhost", true);
         if (!testRunner.isStatisticsPrevalentResource("http://localhost"))

trunk/LayoutTests/http/tests/loading/resourceLoadStatistics/partitioned-cookies-with-and-without-user-interaction.html

@@ -74 +74 @@
         setEnableFeature(true);
 
-        testRunner.statisticsUpdateCookiePartitioningForOneDomain("localhost", true);
+        testRunner.statisticsSetShouldPartitionCookiesForHost("localhost", true);
 
         testRunner.waitUntilDone();

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-07-10  Brent Fulgham  <bfulgham@apple.com>
+
+        Resource Load Statistics: Prune statistics in orders of importance
+        https://bugs.webkit.org/show_bug.cgi?id=174215
+        <rdar://problem/33164403>
+
+        Unreviewed test correction.
+
+        * UIProcess/WebResourceLoadStatisticsStore.cpp:
+        (WebKit::pruneResources): The revised algorithm did not update the remaining
+        count to be pruned, causing a test failure.
+
 2017-07-10  John Wilander  <wilander@apple.com>
 

trunk/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp

@@ -941 +941 @@
         });
     }
-    
-    for (size_t i = 0, end = std::min(numberOfEntriesToPrune, statisticsToPrune.size()); i != end; ++i)
+
+    unsigned removed = 0;
+    for (size_t i = 0, end = std::min(numberOfEntriesToPrune, statisticsToPrune.size()); i != end; ++i) {
         statisticsMap.remove(statisticsToPrune[i].topPrivatelyOwnedDomain);
+        ++removed;
+    }
+
+    numberOfEntriesToPrune -= removed;
 }