Title: [229431] trunk/Source/WebKit
Revision
229431
Author
wilan...@apple.com
Date
2018-03-08 13:35:38 -0800 (Thu, 08 Mar 2018)

Log Message

Resource Load Statistics: Revert defaults read of zero values
https://bugs.webkit.org/show_bug.cgi?id=183476

Unreviewed revert of three small changes landed in r229427.

* UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm:
(WebKit::WebResourceLoadStatisticsStore::registerUserDefaultsIfNeeded):
    Reverted back to strict check of greater than zero for defaults reads.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (229430 => 229431)


--- trunk/Source/WebKit/ChangeLog	2018-03-08 21:30:27 UTC (rev 229430)
+++ trunk/Source/WebKit/ChangeLog	2018-03-08 21:35:38 UTC (rev 229431)
@@ -1,3 +1,14 @@
+2018-03-08  John Wilander  <wilan...@apple.com>
+
+        Resource Load Statistics: Revert defaults read of zero values
+        https://bugs.webkit.org/show_bug.cgi?id=183476
+
+        Unreviewed revert of three small changes landed in r229427.
+
+        * UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm:
+        (WebKit::WebResourceLoadStatisticsStore::registerUserDefaultsIfNeeded):
+            Reverted back to strict check of greater than zero for defaults reads.
+
 2018-03-08  Tim Horton  <timothy_hor...@apple.com>
 
         Don't have SafariServices in minimal simulator build

Modified: trunk/Source/WebKit/UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm (229430 => 229431)


--- trunk/Source/WebKit/UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm	2018-03-08 21:30:27 UTC (rev 229430)
+++ trunk/Source/WebKit/UIProcess/Cocoa/WebResourceLoadStatisticsStoreCocoa.mm	2018-03-08 21:35:38 UTC (rev 229431)
@@ -38,15 +38,15 @@
             setTimeToLiveUserInteraction(timeToLiveUserInteraction);
 
         Seconds timeToLiveCookiePartitionFree([[NSUserDefaults standardUserDefaults] doubleForKey:@"ResourceLoadStatisticsTimeToLiveCookiePartitionFree"]);
-        if (timeToLiveCookiePartitionFree >= 0_s && timeToLiveCookiePartitionFree <= 24_h)
+        if (timeToLiveCookiePartitionFree > 0_s && timeToLiveCookiePartitionFree <= 24_h)
             setTimeToLiveCookiePartitionFree(timeToLiveCookiePartitionFree);
 
         Seconds minimumTimeBetweenDataRecordsRemoval([[NSUserDefaults standardUserDefaults] doubleForKey:@"ResourceLoadStatisticsMinimumTimeBetweenDataRecordsRemoval"]);
-        if (minimumTimeBetweenDataRecordsRemoval >= 0_s && minimumTimeBetweenDataRecordsRemoval < 1_h)
+        if (minimumTimeBetweenDataRecordsRemoval > 0_s && minimumTimeBetweenDataRecordsRemoval < 1_h)
             setMinimumTimeBetweenDataRecordsRemoval(minimumTimeBetweenDataRecordsRemoval);
 
         Seconds grandfatheringTime([[NSUserDefaults standardUserDefaults] doubleForKey:@"ResourceLoadStatisticsGrandfatheringTime"]);
-        if (grandfatheringTime >= 0_s && grandfatheringTime <= 24_h * 7)
+        if (grandfatheringTime > 0_s && grandfatheringTime <= 24_h * 7)
             setGrandfatheringTime(grandfatheringTime);
 
         setDebugLogggingEnabled([[NSUserDefaults standardUserDefaults] boolForKey:@"ResourceLoadStatisticsDebugLoggingEnabled"]);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to