Title: [226680] branches/safari-605-branch/Source/WebKit
- Revision
- 226680
- Author
- [email protected]
- Date
- 2018-01-09 20:31:11 -0800 (Tue, 09 Jan 2018)
Log Message
Cherry-pick r226519. rdar://problem/36392376
Modified Paths
Diff
Modified: branches/safari-605-branch/Source/WebKit/ChangeLog (226679 => 226680)
--- branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-10 04:31:09 UTC (rev 226679)
+++ branches/safari-605-branch/Source/WebKit/ChangeLog 2018-01-10 04:31:11 UTC (rev 226680)
@@ -1,3 +1,17 @@
+2018-01-09 Jason Marcell <[email protected]>
+
+ Cherry-pick r226519. rdar://problem/36392376
+
+ 2018-01-08 Youenn Fablet <[email protected]>
+
+ WebProcessPool::terminateServiceWorkerProcess should protect itself in debug builds
+ https://bugs.webkit.org/show_bug.cgi?id=181384
+
+ Reviewed by Chris Dumez.
+
+ * UIProcess/WebProcessPool.cpp:
+ (WebKit::WebProcessPool::terminateServiceWorkerProcess):
+
2018-01-08 Frederic Wang <[email protected]>
Unreviewed build fix after r226211.
Modified: branches/safari-605-branch/Source/WebKit/UIProcess/WebProcessPool.cpp (226679 => 226680)
--- branches/safari-605-branch/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-01-10 04:31:09 UTC (rev 226679)
+++ branches/safari-605-branch/Source/WebKit/UIProcess/WebProcessPool.cpp 2018-01-10 04:31:11 UTC (rev 226680)
@@ -1458,6 +1458,9 @@
if (!m_serviceWorkerProcess)
return;
+#ifndef NDEBUG
+ auto protectedThis = makeRef(*this);
+#endif
m_serviceWorkerProcess->requestTermination(ProcessTerminationReason::RequestedByClient);
ASSERT(!m_processes.contains(m_serviceWorkerProcess));
ASSERT(!m_serviceWorkerProcess);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
