Changeset 243222 in webkit

Timestamp:

Mar 20, 2019, 12:01:32 PM (7 years ago)

Author:

wilander@apple.com

Message:

(Test fix) Override minimumTimeBetweenDataRecordsRemoval in ResourceLoadStatisticsStore::shouldRemoveDataRecord() during layout tests
​https://bugs.webkit.org/show_bug.cgi?id=196017

Unreviewed test fix.

This patch adds a check of parameters().isRunningTest to the return of
ResourceLoadStatisticsStore::shouldRemoveDataRecord() to allow successive
layout tests to remove website data, effectively overriding the
minimumTimeBetweenDataRecordsRemoval setting.

• NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp:

(WebKit::ResourceLoadStatisticsStore::shouldRemoveDataRecords const):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-20  John Wilander  <wilander@apple.com>
+
+        (Test fix) Override minimumTimeBetweenDataRecordsRemoval in ResourceLoadStatisticsStore::shouldRemoveDataRecord() during layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=196017
+
+        Unreviewed test fix.
+
+        This patch adds a check of parameters().isRunningTest to the return of
+        ResourceLoadStatisticsStore::shouldRemoveDataRecord() to allow successive
+        layout tests to remove website data, effectively overriding the
+        minimumTimeBetweenDataRecordsRemoval setting.
+
+        * NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp:
+        (WebKit::ResourceLoadStatisticsStore::shouldRemoveDataRecords const):
+
 2019-03-20  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp

@@ -407 +407 @@
 #endif
 
-    return !m_lastTimeDataRecordsWereRemoved || MonotonicTime::now() >= (m_lastTimeDataRecordsWereRemoved + m_parameters.minimumTimeBetweenDataRecordsRemoval);
+    return !m_lastTimeDataRecordsWereRemoved || MonotonicTime::now() >= (m_lastTimeDataRecordsWereRemoved + m_parameters.minimumTimeBetweenDataRecordsRemoval) || parameters().isRunningTest;
 }