Title: [236630] trunk/Source/WebKit
- Revision
- 236630
- Author
- [email protected]
- Date
- 2018-09-28 18:36:27 -0700 (Fri, 28 Sep 2018)
Log Message
Skip debug assertion in ResourceLoadStatisticsMemoryStore::recursivelyGetAllDomainsThatHaveRedirectedToThisDomain()
https://bugs.webkit.org/show_bug.cgi?id=190097
<rdar://problem/44877080>
Reviewed by Chris Dumez.
The change in https://bugs.webkit.org/show_bug.cgi?id=190055 causes a
re-classification that may trigger a debug assertion in
ResourceLoadStatisticsMemoryStore::recursivelyGetAllDomainsThatHaveRedirectedToThisDomain().
We should skip the assertion for statistics model version 14 to avoid
this.
* UIProcess/ResourceLoadStatisticsMemoryStore.cpp:
(WebKit::ResourceLoadStatisticsMemoryStore::recursivelyGetAllDomainsThatHaveRedirectedToThisDomain const):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (236629 => 236630)
--- trunk/Source/WebKit/ChangeLog 2018-09-29 01:00:37 UTC (rev 236629)
+++ trunk/Source/WebKit/ChangeLog 2018-09-29 01:36:27 UTC (rev 236630)
@@ -1,3 +1,20 @@
+2018-09-28 John Wilander <[email protected]>
+
+ Skip debug assertion in ResourceLoadStatisticsMemoryStore::recursivelyGetAllDomainsThatHaveRedirectedToThisDomain()
+ https://bugs.webkit.org/show_bug.cgi?id=190097
+ <rdar://problem/44877080>
+
+ Reviewed by Chris Dumez.
+
+ The change in https://bugs.webkit.org/show_bug.cgi?id=190055 causes a
+ re-classification that may trigger a debug assertion in
+ ResourceLoadStatisticsMemoryStore::recursivelyGetAllDomainsThatHaveRedirectedToThisDomain().
+ We should skip the assertion for statistics model version 14 to avoid
+ this.
+
+ * UIProcess/ResourceLoadStatisticsMemoryStore.cpp:
+ (WebKit::ResourceLoadStatisticsMemoryStore::recursivelyGetAllDomainsThatHaveRedirectedToThisDomain const):
+
2018-09-28 Devin Rousso <[email protected]>
Web Inspector: crash in InspectorNetworkAgent::didReceiveResponse when loading denied x-frame resources
Modified: trunk/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp (236629 => 236630)
--- trunk/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp 2018-09-29 01:00:37 UTC (rev 236629)
+++ trunk/Source/WebKit/UIProcess/ResourceLoadStatisticsMemoryStore.cpp 2018-09-29 01:36:27 UTC (rev 236630)
@@ -270,8 +270,10 @@
ASSERT(!RunLoop::isMain());
if (numberOfRecursiveCalls >= maxNumberOfRecursiveCallsInRedirectTraceBack) {
- ASSERT_NOT_REACHED();
- WTFLogAlways("Hit %u recursive calls in redirect backtrace. Returning early.", maxNumberOfRecursiveCallsInRedirectTraceBack);
+ // Model version 14 invokes a deliberate re-classification of the whole set.
+ if (statisticsModelVersion != 14)
+ ASSERT_NOT_REACHED();
+ RELEASE_LOG(ResourceLoadStatistics, "Hit %u recursive calls in redirect backtrace. Returning early.", maxNumberOfRecursiveCallsInRedirectTraceBack);
return numberOfRecursiveCalls;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
