Title: [218135] branches/safari-604.1.25-branch/Source/WebKit2
- Revision
- 218135
- Author
- matthew_han...@apple.com
- Date
- 2017-06-12 13:52:28 -0700 (Mon, 12 Jun 2017)
Log Message
Cherry-pick r218022. rdar://problem/32598919
Modified Paths
Diff
Modified: branches/safari-604.1.25-branch/Source/WebKit2/ChangeLog (218134 => 218135)
--- branches/safari-604.1.25-branch/Source/WebKit2/ChangeLog 2017-06-12 20:52:26 UTC (rev 218134)
+++ branches/safari-604.1.25-branch/Source/WebKit2/ChangeLog 2017-06-12 20:52:28 UTC (rev 218135)
@@ -1,5 +1,23 @@
2017-06-12 Matthew Hanson <matthew_han...@apple.com>
+ Cherry-pick r218022. rdar://problem/32598919
+
+ 2017-06-09 Chris Dumez <cdu...@apple.com>
+
+ Make sure we protect |this| in lambdas in WebResourceLoadStatisticsStore::registerSharedResourceLoadObserver()
+ https://bugs.webkit.org/show_bug.cgi?id=173174
+ <rdar://problem/32598919>
+
+ Reviewed by Darin Adler.
+
+ Follow-up fix to r218006, which caused a crash on the bots. We cannot WTFMove() protectedThis
+ here because the callback gets called several times.
+
+ * UIProcess/WebResourceLoadStatisticsStore.cpp:
+ (WebKit::WebResourceLoadStatisticsStore::registerSharedResourceLoadObserver):
+
+2017-06-12 Matthew Hanson <matthew_han...@apple.com>
+
Cherry-pick r218011. rdar://problem/32679311
2017-06-09 Brent Fulgham <bfulg...@apple.com>
Modified: branches/safari-604.1.25-branch/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp (218134 => 218135)
--- branches/safari-604.1.25-branch/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2017-06-12 20:52:26 UTC (rev 218134)
+++ branches/safari-604.1.25-branch/Source/WebKit2/UIProcess/WebResourceLoadStatisticsStore.cpp 2017-06-12 20:52:28 UTC (rev 218135)
@@ -185,8 +185,8 @@
return;
processStatisticsAndDataRecords();
});
- m_resourceLoadStatisticsStore->setWritePersistentStoreCallback([this, protectedThis = makeRef(*this)]() mutable {
- m_statisticsQueue->dispatch([this, protectedThis = WTFMove(protectedThis)] {
+ m_resourceLoadStatisticsStore->setWritePersistentStoreCallback([this, protectedThis = makeRef(*this)] {
+ m_statisticsQueue->dispatch([this, protectedThis = protectedThis.copyRef()] {
writeStoreToDisk();
});
});
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
