Title: [243222] trunk/Source/WebKit
Revision
243222
Author
[email protected]
Date
2019-03-20 12:01:32 -0700 (Wed, 20 Mar 2019)

Log 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):

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (243221 => 243222)


--- trunk/Source/WebKit/ChangeLog	2019-03-20 18:59:03 UTC (rev 243221)
+++ trunk/Source/WebKit/ChangeLog	2019-03-20 19:01:32 UTC (rev 243222)
@@ -1,3 +1,18 @@
+2019-03-20  John Wilander  <[email protected]>
+
+        (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  <[email protected]>
 
         [iOS] Group UIWebFormAccessoryDelegate-related code and tighten it up a bit

Modified: trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp (243221 => 243222)


--- trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp	2019-03-20 18:59:03 UTC (rev 243221)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/ResourceLoadStatisticsStore.cpp	2019-03-20 19:01:32 UTC (rev 243222)
@@ -406,7 +406,7 @@
     }
 #endif
 
-    return !m_lastTimeDataRecordsWereRemoved || MonotonicTime::now() >= (m_lastTimeDataRecordsWereRemoved + m_parameters.minimumTimeBetweenDataRecordsRemoval);
+    return !m_lastTimeDataRecordsWereRemoved || MonotonicTime::now() >= (m_lastTimeDataRecordsWereRemoved + m_parameters.minimumTimeBetweenDataRecordsRemoval) || parameters().isRunningTest;
 }
 
 void ResourceLoadStatisticsStore::setDataRecordsBeingRemoved(bool value)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to