Changeset 220430 in webkit

Timestamp:

Aug 8, 2017 5:03:55 PM (7 years ago)

Author:

wilander@apple.com

Message:

Resource Load Statistics: Merge of dataRecordsRemoved should use std::max()
​https://bugs.webkit.org/show_bug.cgi?id=175348
<rdar://problem/33785695>

Reviewed by Chris Dumez.

No new tests. Online change of a statistic that doesn't affect logic flow.

• loader/ResourceLoadStatistics.cpp:

(WebCore::ResourceLoadStatistics::merge):

Now uses std::max() instead of addition.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/ResourceLoadStatistics.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-08-08  John Wilander  <wilander@apple.com>
+
+        Resource Load Statistics: Merge of dataRecordsRemoved should use std::max()
+        https://bugs.webkit.org/show_bug.cgi?id=175348
+        <rdar://problem/33785695>
+
+        Reviewed by Chris Dumez.
+
+        No new tests. Online change of a statistic that doesn't affect logic flow.
+
+        * loader/ResourceLoadStatistics.cpp:
+        (WebCore::ResourceLoadStatistics::merge):
+            Now uses std::max() instead of addition.
+
 2017-08-08  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/loader/ResourceLoadStatistics.cpp

@@ -227 +227 @@
     // Prevalent resource stats
     isPrevalentResource |= other.isPrevalentResource;
-    dataRecordsRemoved += other.dataRecordsRemoved;
+    dataRecordsRemoved = std::max(dataRecordsRemoved, other.dataRecordsRemoved);
     
     // In-memory only