Title: [262455] trunk/Source/WebKit
- Revision
- 262455
- Author
- katherine_che...@apple.com
- Date
- 2020-06-02 15:13:07 -0700 (Tue, 02 Jun 2020)
Log Message
Assert network process is not suspended when trying to merge new ITP data
https://bugs.webkit.org/show_bug.cgi?id=212663
<rdar://problem/63892899>
Reviewed by Chris Dumez.
Add a debug assert to check if statistics are being merged into the
ITP database after prepareToSuspend() has been called. If this assert
is hit, it means the ITP database thread is not being stopped when
the process is suspended.
* NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
(WebKit::WebResourceLoadStatisticsStore::resourceLoadStatisticsUpdated):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (262454 => 262455)
--- trunk/Source/WebKit/ChangeLog 2020-06-02 21:58:34 UTC (rev 262454)
+++ trunk/Source/WebKit/ChangeLog 2020-06-02 22:13:07 UTC (rev 262455)
@@ -1,3 +1,19 @@
+2020-06-02 Kate Cheney <katherine_che...@apple.com>
+
+ Assert network process is not suspended when trying to merge new ITP data
+ https://bugs.webkit.org/show_bug.cgi?id=212663
+ <rdar://problem/63892899>
+
+ Reviewed by Chris Dumez.
+
+ Add a debug assert to check if statistics are being merged into the
+ ITP database after prepareToSuspend() has been called. If this assert
+ is hit, it means the ITP database thread is not being stopped when
+ the process is suspended.
+
+ * NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp:
+ (WebKit::WebResourceLoadStatisticsStore::resourceLoadStatisticsUpdated):
+
2020-06-02 Per Arne Vollan <pvol...@apple.com>
REGRESSION(r261387): Introduced sandbox violations
Modified: trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp (262454 => 262455)
--- trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp 2020-06-02 21:58:34 UTC (rev 262454)
+++ trunk/Source/WebKit/NetworkProcess/Classifier/WebResourceLoadStatisticsStore.cpp 2020-06-02 22:13:07 UTC (rev 262455)
@@ -353,6 +353,7 @@
if (!m_statisticsStore)
return;
+ ASSERT(suspendedState == State::Running);
m_statisticsStore->mergeStatistics(WTFMove(statistics));
// We can cancel any pending request to process statistics since we're doing it synchronously below.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
